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

Show
Ignore:
Timestamp:
07/26/10 16:33:12 (19 months ago)
Author:
johnnyoffline
Message:

merge to latest trunk

Location:
plugins/apostrophePlugin/branches/features/css
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • plugins/apostrophePlugin/branches/features/css

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

    r1681 r1849  
    1212        [?php use_javascript('/apostrophePlugin/js/aUI.js') ?] 
    1313 
    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.2.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.2.custom.min.js') ?>', 'last') # JQ Date Picker JS (This can/should be consolidated with sfJqueryReloadedPlugin/js/jquery-ui-sortable...) ?] 
     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...) ?] 
    1616        [?php use_javascript('<?php echo sfConfig::get('sf_jquery_web_dir') ?>/js/plugins/jquery.autocomplete.min.js', 'last') # Autocomplete Plugin for Time Picker JS ?] 
    1717