Changeset 17519


Ignore:
Timestamp:
08/09/12 22:48:01 (7 years ago)
Author:
mistic100
Message:

clean definition of USER_COLLEC_PUBLIC
missing one template var for themes compatibility

Location:
extensions/UserCollections
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • extensions/UserCollections/include/UserCollection.class.php

    r17178 r17519  
    292292      'PUBLIC' => (bool)$this->data['public'], 
    293293      'DATE_CREATION' => format_date($this->data['date_creation'], true), 
    294       'U_PUBLIC' => get_absolute_root_url().'collection/view/'.$this->data['public_id'], 
     294      'U_PUBLIC' => USER_COLLEC_PUBLIC . 'view/'.$this->data['public_id'], 
    295295      'IS_TEMP' =>  $this->data['name'] == 'temp', 
    296296      ); 
  • extensions/UserCollections/include/collections.inc.php

    r17178 r17519  
    289289} 
    290290 
    291 $template->assign('USER_COLLEC_PATH', USER_COLLEC_PATH); 
     291$template->assign(array( 
     292  'USER_COLLEC_PATH' => USER_COLLEC_PATH, 
     293  'USER_COLLEC_ABS_PATH' => realpath(USER_COLLEC_PATH).'/', 
     294  )); 
    292295 
    293296 
  • extensions/UserCollections/include/events.inc.php

    r17320 r17519  
    1515{ 
    1616  global $tokens, $page, $conf; 
    17    
    18   define('USER_COLLEC_PUBLIC', make_index_url(array('section' => 'collections')) . '/'); 
    1917 
    2018  if ($tokens[0] == 'collections') 
     
    204202  $max = 6; 
    205203   
    206   if (!defined('USER_COLLEC_PUBLIC')) define('USER_COLLEC_PUBLIC', make_index_url(array('section' => 'collections')) . '/'); 
    207    
    208204  global $template, $conf, $user, $UserCollection; 
    209205  $menu = &$menu_ref_arr[0]; 
  • extensions/UserCollections/main.inc.php

    r17178 r17519  
    1717define('COLLECTION_IMAGES_TABLE',$prefixeTable.'collection_images'); 
    1818define('USER_COLLEC_ADMIN',      get_root_url() . 'admin.php?page=plugin-' . basename(dirname(__FILE__))); 
     19define('USER_COLLEC_PUBLIC',     get_absolute_root_url() . make_index_url(array('section' => 'collections')) . '/'); 
    1920 
    2021add_event_handler('init', 'user_collections_init'); 
  • extensions/UserCollections/template/edit.tpl

    r17493 r17519  
    8989{/if} 
    9090 
    91 {if $clear}<div style="clear: both;"></div>{/if} 
     91{if $clear}<div style="clear: both;"></div> 
     92</div>{/if} 
    9293</div>{* <!-- content --> *} 
  • extensions/UserCollections/template/list.tpl

    r17493 r17519  
    8989{/if} 
    9090 
    91 {if $clear}<div style="clear: both;"></div>{/if} 
     91{if $clear}<div style="clear: both;"></div> 
     92</div>{/if} 
    9293</div>{* <!-- content --> *} 
  • extensions/UserCollections/template/themes/simple.tpl

    r17493 r17519  
    1212<div id="content"> 
    1313{$MENUBAR} 
     14<div> 
  • extensions/UserCollections/template/themes/stripped.tpl

    r17493 r17519  
    1616<div id="content" {if !$stripped.hideMenu}class="menuShown"{/if}> 
    1717{$MENUBAR} 
     18<div id="content_cell"> 
  • extensions/UserCollections/template/view.tpl

    r17493 r17519  
    2626{if !empty($navbar)}{include file='navigation_bar.tpl'|@get_extent:'navbar'}{/if} 
    2727 
    28 {if $clear}<div style="clear: both;"></div>{/if} 
     28{if $clear}<div style="clear: both;"></div> 
     29</div>{/if} 
    2930</div>{* <!-- content --> *} 
Note: See TracChangeset for help on using the changeset viewer.