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:
1 removed
10 modified
21 copied

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 

  • plugins/apostrophePlugin/branches/features/css/lib/action/BaseaActions.class.php

    r1717 r1849  
    598598    } 
    599599 
    600     $values = aZendSearch::searchLuceneWithValues(Doctrine::getTable('aPage'), $q, aTools::getUserCulture()); 
     600    try 
     601    { 
     602      $values = aZendSearch::searchLuceneWithValues(Doctrine::getTable('aPage'), $q, aTools::getUserCulture()); 
     603    } catch (Exception $e) 
     604    { 
     605      // Lucene search error. TODO: display it nicely if they are always safe things to display. For now: just don't crash 
     606      $values = array(); 
     607    } 
    601608 
    602609    $nvalues = array(); 

  • plugins/apostrophePlugin/branches/features/css/lib/toolkit/aHtml.class.php

    r1818 r1849  
    541541    $label = self::jsEscape(trim($label)); 
    542542    // ACHTUNG: this is carefully crafted to avoid introducing extra whitespace 
    543     return "<a href='#' id='$guid'></a><script type='text/javascript' charset='utf-8'> 
    544           var e = document.getElementById('$guid'); 
     543                // Note: $guid was returning IDs with leading numbers. This threw validation errors so I appended a 'g-' to the ID - JB 7.22.10 
     544    return "<a href='#' id='g-".$guid."'></a><script type='text/javascript' charset='utf-8'> 
     545          var e = document.getElementById('g-".$guid."'); 
    545546      e.setAttribute('href', '$href'); 
    546547      e.innerHTML = '$label'; 

  • plugins/apostrophePlugin/branches/features/css/web/css/a-area-slots.css

    r1703 r1849  
    622622 
    623623.aBlog .a-options.a-slot-form, 
    624 .aEvent .a-options.a-slot-form 
     624.aEvent .a-options.a-slot-form   
    625625{  
    626626width: 300px; 

  • plugins/apostrophePlugin/branches/features/css/web/css/a.css

  • plugins/apostrophePlugin/branches/features/css/web/images

  • plugins/apostrophePlugin/branches/features/css/web/js/aControls.js

    r1818 r1849  
     1// This adds support for indexOF to browsers that are missing this functionality (IE) 
     2// https://developer.mozilla.org/En/Core_JavaScript_1.5_Reference:Objects:Array:indexOf#Compatibility 
     3if (!Array.prototype.indexOf) 
     4{ 
     5  Array.prototype.indexOf = function(elt /*, from*/) 
     6  { 
     7    var len = this.length >>> 0; 
     8 
     9    var from = Number(arguments[1]) || 0; 
     10    from = (from < 0) 
     11         ? Math.ceil(from) 
     12         : Math.floor(from); 
     13    if (from < 0) 
     14      from += len; 
     15 
     16    for (; from < len; from++) 
     17    { 
     18      if (from in this && 
     19          this[from] === elt) 
     20        return from; 
     21    } 
     22    return -1; 
     23  }; 
     24} 
     25 
    126// Copyright 2009 P'unk Avenue LLC. Released under the MIT license. 
    227// See http://www.symfony-project.org/plugins/apostrophePlugin and 

  • plugins/apostrophePlugin/branches/features/css/web/js/aUI.js

    r1719 r1849  
    103103        // }) 
    104104 
    105         //aContext Slot / Area Controls Setup 
    106105        $('.a-controls li:last-child').addClass('last'); // Add 'last' Class To Last Option 
    107         $('.a-controls').css('visibility','visible'); // Display Controls After They Have Been Styled 
    108106         
    109107        // You can define this function in your site.js to execute code whenenever apostrophe calls aUI();