To participate you must create an account on apostrophenow.org. If you have already done so, click Login.

Show
Ignore:
Timestamp:
07/27/10 12:49:56 (19 months ago)
Author:
johnnyoffline
Message:

Fixed a bug where global slots in the layout were editable in Admin areas, because the edit = false flag was never introduced into the templates even after ticket #36 was declared fixed and closed. Also, moved the reset stylesheet up to the sandbox level so that it can be optional for people. Created a new scoped reset style in a-reset that will be used to scope resets to our controls exclusively. Thanks Daniel Lohse. Going to give this a try

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • plugins/apostrophePlugin/branches/features/css/data/generator/sfDoctrineModule/aAdmin/template/templates/_assets.php

    r1849 r1855  
     1[?php use_helper('I18N','jQuery','a')?] 
     2 
    13[?php slot('body_class') ?]a-admin a-admin-generator [?php echo $sf_params->get('module'); ?] [?php echo $sf_params->get('action');?] [?php end_slot() ?] 
    24 
    … …  
    46 
    57        [?php use_stylesheet('<?php echo $this->params['css'] ?>', 'first') ?]  
    6  
    7 <?php else: ?>  
    8  
    9         [?php use_stylesheet('/apostrophePlugin/css/a.css', 'first') ?] 
    10  
    11         [?php use_javascript('/apostrophePlugin/js/aControls.js') ?] 
    12         [?php use_javascript('/apostrophePlugin/js/aUI.js') ?] 
    13  
    14         [?php use_stylesheet('<?php echo sfConfig::get('sf_jquery_web_dir') ?>/css/<?php echo sfConfig::get('sf_jquery_ui_css', 'ui-apostrophe/jquery-ui-1.7.3.custom.css') ?>', 'first') # JQ Date Picker Styles (This is the custome Apostrophe styles for the JQ Date Picker) ?] 
    15         [?php use_javascript('<?php echo sfConfig::get('sf_jquery_web_dir') ?>/js/plugins/<?php echo sfConfig::get('sf_jquery_ui', 'jquery-ui-1.7.3.custom.min.js') ?>', 'last') # JQ Date Picker JS (This can/should be consolidated with sfJqueryReloadedPlugin/js/jquery-ui-sortable...) ?] 
    16         [?php use_javascript('<?php echo sfConfig::get('sf_jquery_web_dir') ?>/js/plugins/jquery.autocomplete.min.js', 'last') # Autocomplete Plugin for Time Picker JS ?] 
    17  
     8         
    189<?php endif; ?> 
    1910