Development

Changeset 31183

You must first sign up to be able to contribute.

Changeset 31183

Show
Ignore:
Timestamp:
10/19/10 22:36:13 (3 years ago)
Author:
odracci
Message:

Changed sfPropelPlugin to sfDoctrinePlugin. Fix image path to sfAssetsLibraryPlugin

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • plugins/sfDoctrineAssetsLibraryPlugin/trunk/lib/form/sfAssetsForm.class.php

    r31179 r31183  
    3131  /** 
    3232   * save all assets 
    33    * @param PropelPDO $con 
     33   * @param Doctrine_connection $con 
    3434   */ 
    3535  protected function doSave($con = null) 

  • plugins/sfDoctrineAssetsLibraryPlugin/trunk/lib/helper/sfAssetHelper.php

    r31180 r31183  
    3030    if ($asset->isPdf() && !is_readable(sfConfig::get('sf_web_dir') . $src)) 
    3131    { 
    32       $src = '/sfAssetsLibraryPlugin/images/pdf.png'; 
     32      $src = '/sfDoctrineAssetsLibraryPlugin/images/pdf.png'; 
    3333    } 
    3434  } 
    …… 
    4242    { 
    4343      case 'txt': 
    44         $src = '/sfAssetsLibraryPlugin/images/txt.png'; 
     44        $src = '/sfDoctrineAssetsLibraryPlugin/images/txt.png'; 
    4545        break; 
    4646      case 'xls': 
    47         $src = '/sfAssetsLibraryPlugin/images/xls.png'; 
     47        $src = '/sfDoctrineAssetsLibraryPlugin/images/xls.png'; 
    4848        break; 
    4949      case 'doc': 
    50         $src = '/sfAssetsLibraryPlugin/images/doc.png'; 
     50        $src = '/sfDoctrineAssetsLibraryPlugin/images/doc.png'; 
    5151        break; 
    5252      case 'pdf': 
    53         $src = '/sfAssetsLibraryPlugin/images/pdf.png'; 
     53        $src = '/sfDoctrineAssetsLibraryPlugin/images/pdf.png'; 
    5454        break; 
    5555      case 'html': 
    56         $src = '/sfAssetsLibraryPlugin/images/html.png'; 
     56        $src = '/sfDoctrineAssetsLibraryPlugin/images/html.png'; 
    5757        break; 
    5858      case 'archive': 
    59         $src = '/sfAssetsLibraryPlugin/images/archive.png'; 
     59        $src = '/sfDoctrineAssetsLibraryPlugin/images/archive.png'; 
    6060        break; 
    6161      case 'bin': 
    62         $src = '/sfAssetsLibraryPlugin/images/bin.png'; 
     62        $src = '/sfDoctrineAssetsLibraryPlugin/images/bin.png'; 
    6363        break; 
    6464      default: 
    65         $src = '/sfAssetsLibraryPlugin/images/unknown.png'; 
     65        $src = '/sfDoctrineAssetsLibraryPlugin/images/unknown.png'; 
    6666    } 
    6767  } 
    …… 
    112112{ 
    113113  sfContext::getInstance()->getEventDispatcher()->connect('response.filter_content', 'insert_asset_popup_url'); 
    114   use_javascript('/sfAssetsLibraryPlugin/js/main', 'last'); 
     114  use_javascript('/sfDoctrineAssetsLibraryPlugin/js/main', 'last'); 
    115115} 
    116116 
    …… 
    204204   
    205205  return '<a id="sf_asset_input_image" href="#" rel="{url: \'' . $url . '\', name: \'' . $name . '\', type: \'' . $options['type'] . '\'}">' . 
    206     image_tag('/sfAssetsLibraryPlugin/images/folder_open', array('alt' => 'Insert Image', 'title' => __('Insert Image', null, 'sfAsset'))) . '</a> ' . 
     206    image_tag('/sfDoctrineAssetsLibraryPlugin/images/folder_open', array('alt' => 'Insert Image', 'title' => __('Insert Image', null, 'sfAsset'))) . '</a> ' . 
    207207    asset_image_tag($asset, 'small', array('id' => $options['id'] . '_img')); 
    208208} 

  • plugins/sfDoctrineAssetsLibraryPlugin/trunk/lib/sfAssetsLibraryTools.class.php

    r31180 r31183  
    105105    else 
    106106    { 
    107       $info['icon'] = '/sfAssetsLibraryPlugin/images/unknown.png'; 
    108       if (is_readable(sfConfig::get('sf_web_dir').'/sfAssetsLibraryPlugin/images/'.$info['ext'].'.png')) 
    109       { 
    110         $info['icon'] = '/sfAssetsLibraryPlugin/images/'.$info['ext'].'.png'; 
     107      $info['icon'] = '/sfDoctrineAssetsLibraryPlugin/images/unknown.png'; 
     108      if (is_readable(sfConfig::get('sf_web_dir').'/sfDoctrineAssetsLibraryPlugin/images/'.$info['ext'].'.png')) 
     109      { 
     110        $info['icon'] = '/sfDoctrineAssetsLibraryPlugin/images/'.$info['ext'].'.png'; 
    111111      } 
    112112    } 

  • plugins/sfDoctrineAssetsLibraryPlugin/trunk/lib/widget/sfWidgetFormAssetInput.class.php

    r31176 r31183  
    5656  public function getJavascripts() 
    5757  { 
    58     return array('/sfAssetsLibraryPlugin/js/main'); 
     58    return array('/sfDoctrineAssetsLibraryPlugin/js/main'); 
    5959  } 
    6060 

  • plugins/sfDoctrineAssetsLibraryPlugin/trunk/test/unit/sfAssetsLibraryToolsTest.php

    r31171 r31183  
    66include dirname(__FILE__).'/../../../../test/bootstrap/unit.php'; 
    77$pluginPaths = $configuration->getAllPluginPaths(); 
    8 include $pluginPaths['sfAssetsLibraryPlugin'] . '/lib/sfAssetsLibraryTools.class.php'; 
     8include $pluginPaths['sfDoctrineAssetsLibraryPlugin'] . '/lib/sfAssetsLibraryTools.class.php'; 
    99 
    1010// run the test 

  • plugins/sfDoctrineAssetsLibraryPlugin/trunk/web/css/media.css

    r31171 r31183  
    366366  font-size: 11px; 
    367367  color: #fff; 
    368   background: #73B65A url(/sfPropelPlugin/images/ok.png) no-repeat 5px 2px; 
     368  background: #73B65A url(/sfDoctrinePlugin/images/ok.png) no-repeat 5px 2px; 
    369369} 
    370370 
    …… 
    393393  font-size: 11px; 
    394394  color: #fff; 
    395   background: #f33 url(/sfPropelPlugin/images/error.png) no-repeat 5px 2px; 
     395  background: #f33 url(/sfDoctrinePlugin/images/error.png) no-repeat 5px 2px; 
    396396} 
    397397 
    …… 
    491491#sf_asset_container .sf_admin_action_create 
    492492{ 
    493   background: url(/sfPropelPlugin/images/add.png) no-repeat 3px 2px; 
     493  background: url(/sfDoctrinePlugin/images/add.png) no-repeat 3px 2px; 
    494494  border-right: 4px solid #73B65A !important; 
    495495} 
    …… 
    515515#sf_asset_container .sf_admin_action_delete 
    516516{ 
    517   background: url(/sfPropelPlugin/images/delete.png) no-repeat 3px 2px; 
     517  background: url(/sfDoctrinePlugin/images/delete.png) no-repeat 3px 2px; 
    518518  border-right: 4px solid #E75C58 !important; 
    519519} 
    …… 
    521521#sf_asset_container .sf_admin_action_cancel 
    522522{ 
    523   background: url(/sfPropelPlugin/images/cancel.png) no-repeat 3px 2px; 
     523  background: url(/sfDoctrinePlugin/images/cancel.png) no-repeat 3px 2px; 
    524524  border-right: 4px solid #E75C58 !important; 
    525525} 
    …… 
    527527#sf_asset_container .sf_admin_action_filter 
    528528{ 
    529   background: url(/sfPropelPlugin/images/filter.png) no-repeat 3px 2px; 
     529  background: url(/sfDoctrinePlugin/images/filter.png) no-repeat 3px 2px; 
    530530  border-right: 4px solid #66f !important; 
    531531} 
    …… 
    533533#sf_asset_container .sf_admin_action_reset_filter 
    534534{ 
    535   background: url(/sfPropelPlugin/images/reset.png) no-repeat 3px 2px; 
     535  background: url(/sfDoctrinePlugin/images/reset.png) no-repeat 3px 2px; 
    536536  border-right: 4px solid #E75C58 !important; 
    537537} 
    …… 
    539539#sf_asset_container .sf_admin_action_list 
    540540{ 
    541   background: url(/sfPropelPlugin/images/list.png) no-repeat 3px 2px; 
     541  background: url(/sfDoctrinePlugin/images/list.png) no-repeat 3px 2px; 
    542542  border-right: 4px solid #66f !important; 
    543543}