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

Changeset 1829

Show
Ignore:
Timestamp:
07/22/2010 07:56:00 PM (7 weeks ago)
Author:
johnnyoffline
Message:

updated blog plugin to use jquery ui 1.7.3 by default if it is not set in settings.yml - 1.4 and trunk

Location:
plugins/apostropheBlogPlugin/branches/1.4
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • plugins/apostropheBlogPlugin/branches/1.4/data/generator/sfDoctrineModule/aBlogAdmin/template/templates/_assets.php

    r1420 r1829  
    66  [?php use_javascript('/apostrophePlugin/js/aUI.js') ?] 
    77 
    8         [?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) ?] 
    9         [?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...) ?] 
     8        [?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) ?] 
     9        [?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...) ?] 
    1010 
    1111[?php aTools::setAllowSlotEditing(false); ?] 
  • plugins/apostropheBlogPlugin/branches/1.4/web/css/aBlog.css

    r1768 r1829  
    440440{ 
    441441width: 200px !important; 
    442 width: auto; /* ? For IE */ 
    443 float: left; /* Was float:right, but this broke in IE */ 
     442width: auto; /* For IE */ 
     443float: left; 
    444444display:inline; 
    445445clear: both; 
     
    467467float: left; 
    468468font-family: Arial, sans-serif; 
     469font-size: 11px; 
    469470border: 1px solid #ddd; 
    470 padding: 3px 0px; 
     471padding: 3px 2px; 
    471472border: 1px solid rgba(0,0,0,0.2); 
    472473-moz-border-radius: 3px;