Changeset 534 for trunk/services


Ignore:
Timestamp:
Jul 27, 2015 7:56:08 AM (9 years ago)
Author:
anonymous
Message:

Improved module maker validation output. Allow disabling cache at run time for ACL. Added ACL getList() method. Improved ACL CLI listing. Fixed app boomerang array initialization. Now retaining identical boomerang URLs if the key is different. Added a maximum boomerang time. Added a way to disable cache per request through a query string. Added validator isDecimal() method. Added disableSelectOptions() HTML method. Added getGravatarURL() method. Change how navigation page array is managed. Updated navigation currentPage() method to test an array of URLs.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/services/templates/lock.ihtml

    r497 r534  
    2323                ); ?>
    2424                </p>
    25                 <?php if ($lock->getSecondsElapsed() >= $lock->getParam('timeout')) { ?>
    26                     <p class="sc-msg-notice"><?php printf(_("You can forcibly unlock the record if you believe the editing session has expired. You might want to confirm with %s before doing this."), $lock->getEditor()) ?></p>
    27                     <div class="sc-msg-notice">
    28                         <?php
    29                         HTML::printButtons(array(
    30                             array('name' => 'unlock', 'value' => _("Unlock"), 'class' => 'small button alert', 'accesskey' => 'u'),
    31                             array('name' => 'cancel', 'value' => _("Cancel"), 'class' => 'small button secondary', 'accesskey' => 'c'),
    32                         ));
    33                         ?>
    34                     </div>
    35                 <?php } else { ?>
    36                     <div class="sc-msg-notice">
    37                         <?php
    38                         HTML::printButtons(array(
    39                             array('name' => 'cancel', 'value' => _("Cancel"), 'class' => 'small button secondary', 'accesskey' => 'c'),
    40                         ));
    41                         ?>
    42                     </div>
    43                 <?php } ?>
    4425            </div>
    4526        </div>
     27        <?php if ($lock->getSecondsElapsed() >= $lock->getParam('timeout')) { ?>
     28            <div id="sc-msg" class="sc-msg row">
     29                <div class="large-12 columns">
     30                    <p class="sc-msg-notice"><?php printf(_("You can forcibly unlock the record if you believe the editing session has expired. You might want to confirm with %s before doing this."), $lock->getEditor()) ?></p>
     31                </div>
     32            </div>
     33            <div class="row sc-submit-buttons">
     34                <div class="large-12 columns">
     35                    <?php
     36                    HTML::printButtons(array(
     37                        array('name' => 'unlock', 'value' => _("Unlock"), 'class' => 'small button alert', 'accesskey' => 'u'),
     38                        array('name' => 'cancel', 'value' => _("Cancel"), 'class' => 'small button secondary', 'accesskey' => 'c'),
     39                    ));
     40                    ?>
     41                </div>
     42            </div>
     43        <?php } else { ?>
     44            <div class="row sc-submit-buttons">
     45                <div class="large-12 columns">
     46                    <?php
     47                    HTML::printButtons(array(
     48                        array('name' => 'cancel', 'value' => _("Cancel"), 'class' => 'small button secondary', 'accesskey' => 'c'),
     49                    ));
     50                    ?>
     51                </div>
     52            </div>
     53        <?php } ?>
    4654    </form>
    4755</main>
Note: See TracChangeset for help on using the changeset viewer.