Changeset 10812


Ignore:
Timestamp:
05/07/11 17:55:10 (8 years ago)
Author:
mistic100
Message:

merge spread_menus to the core

Location:
trunk
Files:
1 added
31 edited

Legend:

Unmodified
Added
Removed
  • trunk/about.php

    r8728 r10812  
    3737$title= l10n('About Piwigo'); 
    3838$page['body_id'] = 'theAboutPage'; 
    39 include(PHPWG_ROOT_PATH.'include/page_header.php'); 
    4039 
    4140trigger_action('loc_begin_about'); 
     
    5150} 
    5251 
     52// include menubar 
     53$themeconf = $template->get_template_vars('themeconf'); 
     54if (!isset($themeconf['Exclude']) OR !in_array('theAboutPage', $themeconf['Exclude'])) 
     55{ 
     56  include( PHPWG_ROOT_PATH.'include/menubar.inc.php'); 
     57} 
     58 
     59include(PHPWG_ROOT_PATH.'include/page_header.php'); 
    5360$template->pparse('about'); 
    5461include(PHPWG_ROOT_PATH.'include/page_tail.php'); 
  • trunk/admin/configuration.php

    r10122 r10812  
    8585    'picture_navigation_icons', 
    8686    'picture_navigation_thumb', 
     87    'picture_menu', 
    8788  ); 
    8889 
  • trunk/admin/themes/default/template/configuration.tpl

    r10122 r10812  
    284284        <span class="property">{'Activate Navigation Thumbnails'|@translate}</span> 
    285285        <input type="checkbox" name="picture_navigation_thumb" {if ($display.picture_navigation_thumb)}checked="checked"{/if}> 
     286      </label> 
     287    </li> 
     288     
     289    <li> 
     290      <label> 
     291        <span class="property">{'Show menubar'|@translate}</span> 
     292        <input type="checkbox" name="picture_menu" {if ($display.picture_menu)}checked="checked"{/if}> 
    286293      </label> 
    287294    </li> 
  • trunk/comments.php

    r9679 r10812  
    528528  } 
    529529} 
     530 
     531// include menubar 
     532$themeconf = $template->get_template_vars('themeconf'); 
     533if (!isset($themeconf['Exclude']) OR !in_array('theCommentsPage', $themeconf['Exclude'])) 
     534{ 
     535  include( PHPWG_ROOT_PATH.'include/menubar.inc.php'); 
     536} 
     537 
    530538// +-----------------------------------------------------------------------+ 
    531539// |                           html code display                           | 
  • trunk/identification.php

    r8728 r10812  
    7474$title = l10n('Identification'); 
    7575$page['body_id'] = 'theIdentificationPage'; 
    76 include(PHPWG_ROOT_PATH.'include/page_header.php'); 
    7776 
    7877$template->set_filenames( array('identification'=>'identification.tpl') ); 
     
    9897} 
    9998 
     99// include menubar 
     100$themeconf = $template->get_template_vars('themeconf'); 
     101if (!isset($themeconf['Exclude']) OR !in_array('theIdentificationPage', $themeconf['Exclude'])) 
     102{ 
     103  include( PHPWG_ROOT_PATH.'include/menubar.inc.php'); 
     104} 
     105 
    100106//----------------------------------------------------------- html code display 
     107include(PHPWG_ROOT_PATH.'include/page_header.php'); 
    101108$template->pparse('identification'); 
    102109include(PHPWG_ROOT_PATH.'include/page_tail.php'); 
  • trunk/install/config.sql

    r10653 r10812  
    4343INSERT INTO piwigo_config (param,value,comment) VALUES ('picture_navigation_icons','true','Display navigation icons on picture page'); 
    4444INSERT INTO piwigo_config (param,value,comment) VALUES ('picture_navigation_thumb','true','Display navigation thumbnails on picture page'); 
     45INSERT INTO piwigo_config (param,value,comment) VALUES ('picture_menu','false','Show menubar on picture page'); 
    4546INSERT INTO piwigo_config (param,value,comment) 
    4647  VALUES ( 
  • trunk/language/en_UK/admin.lang.php

    r10769 r10812  
    606606$lang['Settings'] = 'Settings'; 
    607607$lang['Show info'] = "Show info"; 
     608$lang['Show menubar'] = "Show menubar"; 
    608609$lang['Simulation'] = "Simulation"; 
    609610$lang['singly represented'] = "fixed representative"; 
  • trunk/language/fr_CA/admin.lang.php

    r10378 r10812  
    800800$lang['Restore'] = "Restaurer"; 
    801801$lang['Restore default configuration. You will lost your plugin settings!'] = "Restaurer la configuration par défaut? Vous perdrez vos réglages personnels !"; 
     802$lang['Show menubar'] = "Afficher le menu"; 
    802803?> 
  • trunk/language/fr_FR/admin.lang.php

    r10769 r10812  
    842842$lang['If you want to regenerate thumbnails, please go to the <a href="%s">Batch Manager</a>.'] = 'Si vous voulez régénérer des miniatures, merci de vous rendre dans la <a href="%s">Gestion par lot</a>.'; 
    843843$lang['Graphics Library'] = 'Bibliothèque graphique'; 
     844$lang['Show menubar'] = "Afficher le menu"; 
    844845?> 
  • trunk/nbm.php

    r8728 r10812  
    6666$title = l10n('Notification'); 
    6767$page['body_id'] = 'theNBMPage'; 
    68 include(PHPWG_ROOT_PATH.'include/page_header.php'); 
    6968 
    7069$template->set_filenames(array('nbm'=>'nbm.tpl')); 
     
    7978    ) 
    8079  ); 
     80   
     81// include menubar 
     82$themeconf = $template->get_template_vars('themeconf'); 
     83if (!isset($themeconf['Exclude']) OR !in_array('theNBMPage', $themeconf['Exclude'])) 
     84{ 
     85  include( PHPWG_ROOT_PATH.'include/menubar.inc.php'); 
     86} 
    8187 
    8288// +-----------------------------------------------------------------------+ 
    8389// | html code display                                                     | 
    8490// +-----------------------------------------------------------------------+ 
     91include(PHPWG_ROOT_PATH.'include/page_header.php'); 
    8592$template->parse('nbm'); 
    8693include(PHPWG_ROOT_PATH.'include/page_tail.php'); 
  • trunk/notification.php

    r8728 r10812  
    7878    ) 
    7979  ); 
     80   
     81// include menubar 
     82$themeconf = $template->get_template_vars('themeconf'); 
     83if (!isset($themeconf['Exclude']) OR !in_array('theNotificationPage', $themeconf['Exclude'])) 
     84{ 
     85  include( PHPWG_ROOT_PATH.'include/menubar.inc.php'); 
     86} 
    8087 
    8188// +-----------------------------------------------------------------------+ 
  • trunk/password.php

    r9169 r10812  
    154154$template->assign('infos', $page['infos']); 
    155155 
     156// include menubar 
     157$themeconf = $template->get_template_vars('themeconf'); 
     158if (!isset($themeconf['Exclude']) OR !in_array('thePasswordPage', $themeconf['Exclude'])) 
     159{ 
     160  include( PHPWG_ROOT_PATH.'include/menubar.inc.php'); 
     161} 
     162 
    156163// +-----------------------------------------------------------------------+ 
    157164// |                           html code display                           | 
  • trunk/picture.php

    r10160 r10812  
    10411041} 
    10421042 
     1043// include menubar 
     1044$themeconf = $template->get_template_vars('themeconf'); 
     1045if ($conf['picture_menu'] AND (!isset($themeconf['Exclude']) OR !in_array('theIdentificationPage', $themeconf['Exclude']))) 
     1046{ 
     1047  include( PHPWG_ROOT_PATH.'include/menubar.inc.php'); 
     1048  $template->assign('U_ADMIN', $url_admin); // overwrited by the menu 
     1049} 
     1050 
    10431051include(PHPWG_ROOT_PATH.'include/page_header.php'); 
    10441052trigger_action('loc_end_picture'); 
  • trunk/profile.php

    r10198 r10812  
    6969  $title= l10n('Your Gallery Customization'); 
    7070  $page['body_id'] = 'theProfilePage'; 
    71   include(PHPWG_ROOT_PATH.'include/page_header.php'); 
     71  $template->set_filename('profile', 'profile.tpl'); 
    7272 
    7373  load_profile_in_template( 
     
    8383    $template->assign('errors', $errors); 
    8484  } 
    85   $template->set_filename('profile', 'profile.tpl'); 
     85   
     86  // include menubar 
     87  $themeconf = $template->get_template_vars('themeconf'); 
     88  if (!isset($themeconf['Exclude']) OR !in_array('theProfilePage', $themeconf['Exclude'])) 
     89  { 
     90    include( PHPWG_ROOT_PATH.'include/menubar.inc.php'); 
     91  } 
     92   
     93  include(PHPWG_ROOT_PATH.'include/page_header.php'); 
    8694  trigger_action('loc_end_profile'); 
    8795  $template->pparse('profile'); 
  • trunk/register.php

    r8728 r10812  
    8181$title= l10n('Registration'); 
    8282$page['body_id'] = 'theRegisterPage'; 
    83 include(PHPWG_ROOT_PATH.'include/page_header.php'); 
    8483 
    8584$template->set_filenames( array('register'=>'register.tpl') ); 
     
    9897} 
    9998 
     99// include menubar 
     100$themeconf = $template->get_template_vars('themeconf'); 
     101if (!isset($themeconf['Exclude']) OR !in_array('theRegisterPage', $themeconf['Exclude'])) 
     102{ 
     103  include( PHPWG_ROOT_PATH.'include/menubar.inc.php'); 
     104} 
     105 
     106include(PHPWG_ROOT_PATH.'include/page_header.php'); 
    100107$template->parse('register'); 
    101108include(PHPWG_ROOT_PATH.'include/page_tail.php'); 
  • trunk/search.php

    r8728 r10812  
    228228  $template->assign('errors', $errors); 
    229229} 
    230 //------------------------------------------------------------ log informations 
     230 
     231// include menubar 
     232$themeconf = $template->get_template_vars('themeconf'); 
     233if (!isset($themeconf['Exclude']) OR !in_array('theSearchPage', $themeconf['Exclude'])) 
     234{ 
     235  include( PHPWG_ROOT_PATH.'include/menubar.inc.php'); 
     236} 
     237 
     238//------------------------------------------------------------ html code display 
    231239include(PHPWG_ROOT_PATH.'include/page_header.php'); 
    232240$template->pparse('search'); 
  • trunk/tags.php

    r8728 r10812  
    192192} 
    193193 
     194// include menubar 
     195$themeconf = $template->get_template_vars('themeconf'); 
     196if (!isset($themeconf['Exclude']) OR !in_array('theTagsPage', $themeconf['Exclude'])) 
     197{ 
     198  include( PHPWG_ROOT_PATH.'include/menubar.inc.php'); 
     199} 
     200 
    194201include(PHPWG_ROOT_PATH.'include/page_header.php'); 
    195202$template->pparse('tags'); 
  • trunk/themes/Sylvia/theme.css

    r10640 r10812  
    142142        background:#222 url(images/fillet.gif) repeat-x scroll left top;  
    143143        min-height:466px;  
     144        border: 1px solid #000;  
     145        border-top: 0;  
     146        margin:21px 7px 0 290px !important;  
     147        padding-top:7px;  
    144148} 
    145149 
     
    154158        width: 100%;  
    155159        min-width: 100%;  
    156 } 
    157  
    158 #theCategoryPage .content {  
    159         border: 1px solid #000;  
    160         border-top: 0;  
    161         margin:21px 7px 0 290px !important;  
    162         padding-top:7px;  
    163160} 
    164161 
     
    363360} 
    364361 
     362.pictureContent { 
     363        margin:0 7px 7px 290px; 
     364} 
     365 
    365366#addComment fieldset { 
    366367  color: #f70; 
  • trunk/themes/default/local_head.tpl

    r7987 r10812  
    88        {combine_css path="themes/default/print.css" order=-10} 
    99{/if} 
     10 
     11{if !isset($MENUBAR)}<style type="text/css">.content {ldelim} margin-left:auto !important; }</style>{/if} 
  • trunk/themes/default/template/about.tpl

    r8374 r10812  
     1{if isset($MENUBAR)}{$MENUBAR}{/if} 
    12<div id="content" class="content"> 
    23  <div class="titrePage"> 
    3     <ul class="categoryActions"> 
    4                         <li><a href="{$U_HOME}" title="{'Home'|@translate}" class="pwg-state-default pwg-button"> 
    5                                 <span class="pwg-icon pwg-icon-home">&nbsp;</span><span class="pwg-button-text">{'Home'|@translate}</span> 
    6                         </a></li> 
    7     </ul> 
     4    <ul class="categoryActions"></ul> 
    85    <h2>{'About'|@translate}</h2> 
    96  </div> 
  • trunk/themes/default/template/comments.tpl

    r8076 r10812  
     1{if isset($MENUBAR)}{$MENUBAR}{/if} 
    12<div id="content" class="content"> 
    23 
    34<div class="titrePage"> 
    4         <ul class="categoryActions"> 
    5                 <li><a href="{$U_HOME}" title="{'Home'|@translate}" class="pwg-state-default pwg-button"> 
    6                         <span class="pwg-icon pwg-icon-home">&nbsp;</span><span class="pwg-button-text">{'Home'|@translate}</span> 
    7                 </a></li> 
    8         </ul> 
     5        <ul class="categoryActions"></ul> 
    96        <h2>{'User comments'|@translate}</h2> 
    107</div> 
  • trunk/themes/default/template/identification.tpl

    r8076 r10812  
     1{if isset($MENUBAR)}{$MENUBAR}{/if} 
    12<div id="content" class="content"> 
    23 
    34<div class="titrePage"> 
    4         <ul class="categoryActions"> 
    5                 <li><a href="{$U_HOME}" title="{'Home'|@translate}" class="pwg-state-default pwg-button"> 
    6                         <span class="pwg-icon pwg-icon-home">&nbsp;</span><span class="pwg-button-text">{'Home'|@translate}</span> 
    7                 </a></li> 
    8         </ul> 
     5        <ul class="categoryActions"></ul> 
    96        <h2>{'Identification'|@translate}</h2> 
    107</div> 
  • trunk/themes/default/template/nbm.tpl

    r8091 r10812  
    1  
     1{if isset($MENUBAR)}{$MENUBAR}{/if} 
    22<div id="content" class="content"> 
    33        <div class="titrePage"> 
    4                 <ul class="categoryActions"> 
    5                         <li><a href="{$U_HOME}" title="{'Home'|@translate}" class="pwg-state-default pwg-button"> 
    6                                 <span class="pwg-icon pwg-icon-home">&nbsp;</span><span class="pwg-button-text">{'Home'|@translate}</span> 
    7                         </a></li> 
    8                 </ul> 
     4                <ul class="categoryActions"></ul> 
    95                <h2>{'Notification'|@translate}</h2> 
    106        </div> 
  • trunk/themes/default/template/notification.tpl

    r8711 r10812  
    33<link rel="alternate" type="application/rss+xml" title="{'Complete RSS feed (photos, comments)'|@translate}" href="{$U_FEED}">  
    44{/html_head}  
     5 
     6{if isset($MENUBAR)}{$MENUBAR}{/if} 
    57<div id="content" class="content"> 
    68 
    79  <div class="titrePage"> 
    8     <ul class="categoryActions"> 
    9                 <li><a href="{$U_HOME}" title="{'Home'|@translate}" class="pwg-state-default pwg-button"> 
    10                         <span class="pwg-icon pwg-icon-home">&nbsp;</span><span class="pwg-button-text">{'Home'|@translate}</span> 
    11                 </a></li> 
    12     </ul> 
     10    <ul class="categoryActions"></ul> 
    1311    <h2>{'Notification'|@translate}</h2> 
    1412  </div> 
  • trunk/themes/default/template/password.tpl

    r8091 r10812  
     1{if isset($MENUBAR)}{$MENUBAR}{/if} 
    12<div id="content" class="content"> 
    23 
    34        <div class="titrePage"> 
    4                 <ul class="categoryActions"> 
    5                         <li><a href="{$U_HOME}" title="{'Go through the gallery as a visitor'|@translate}" class="pwg-state-default pwg-button"> 
    6                                 <span class="pwg-icon pwg-icon-home">&nbsp;</span><span class="pwg-button-text">{'Home'|@translate}</span> 
    7                         </a></li> 
    8                 </ul> 
     5                <ul class="categoryActions"></ul> 
    96                <h2>{'Password forgotten'|@translate}</h2> 
    107        </div> 
  • trunk/themes/default/template/picture.tpl

    r10804 r10812  
    22{include file='include/autosize.inc.tpl'} 
    33*} 
     4 
     5{if isset($MENUBAR)} 
     6{$MENUBAR} 
     7<div id="content" class="pictureContent"> 
     8{/if} 
    49 
    510{if isset($errors)} 
     
    311316 
    312317{if !empty($PLUGIN_PICTURE_AFTER)}{$PLUGIN_PICTURE_AFTER}{/if} 
     318 
     319{if isset($MENUBAR)} 
     320</div> 
     321{/if} 
  • trunk/themes/default/template/profile.tpl

    r8076 r10812  
     1{if isset($MENUBAR)}{$MENUBAR}{/if} 
    12<div id="content" class="content"> 
    23 
     
    1213 
    1314<div class="titrePage"> 
    14         <ul class="categoryActions"> 
    15                 <li><a href="{$U_HOME}" title="{'Home'|@translate}" class="pwg-state-default pwg-button"> 
    16                         <span class="pwg-icon pwg-icon-home">&nbsp;</span><span class="pwg-button-text">{'Home'|@translate}</span> 
    17                 </a></li> 
    18         </ul> 
     15        <ul class="categoryActions"></ul> 
    1916        <h2>{'Profile'|@translate}</h2> 
    2017</div> 
  • trunk/themes/default/template/register.tpl

    r8635 r10812  
     1{if isset($MENUBAR)}{$MENUBAR}{/if} 
    12<div id="registerPage"> 
    23 
     
    45 
    56<div class="titrePage"> 
    6         <ul class="categoryActions"> 
    7                 <li><a href="{$U_HOME}" title="{'Home'|@translate}" class="pwg-state-default pwg-button"> 
    8                         <span class="pwg-icon pwg-icon-home">&nbsp;</span><span class="pwg-button-text">{'Home'|@translate}</span> 
    9                 </a></li> 
    10         </ul> 
     7        <ul class="categoryActions"></ul> 
    118        <h2>{'Registration'|@translate}</h2> 
    129</div> 
  • trunk/themes/default/template/search.tpl

    r8076 r10812  
    1515*} 
    1616 
     17{if isset($MENUBAR)}{$MENUBAR}{/if} 
    1718<div id="content" class="content"> 
    1819 
     
    2223                        <li><a href="{$U_HELP}" onclick="popuphelp(this.href); return false;" title="{'Help'|@translate}" class="pwg-state-default pwg-button"> 
    2324                                <span class="pwg-icon pwg-icon-help">&nbsp;</span><span class="pwg-button-text">{'Help'|@translate}</span> 
    24                         </a></li> 
    25                         <li><a href="{$U_HOME}" title="{'Home'|@translate}" class="pwg-state-default pwg-button"> 
    26                                 <span class="pwg-icon pwg-icon-home">&nbsp;</span><span class="pwg-button-text">{'Home'|@translate}</span> 
    2725                        </a></li> 
    2826                </ul> 
  • trunk/themes/default/template/tags.tpl

    r8665 r10812  
     1{if isset($MENUBAR)}{$MENUBAR}{/if} 
    12<div id="content" class="content"> 
    23 
     
    1314                </a></li> 
    1415{/if} 
    15                 <li><a href="{$U_HOME}" title="{'Home'|@translate}" class="pwg-state-default pwg-button"> 
    16                         <span class="pwg-icon pwg-icon-home">&nbsp;</span><span class="pwg-button-text">{'Home'|@translate}</span> 
    17                 </a></li> 
    1816        </ul> 
    1917        <h2>{'Tags'|@translate}</h2> 
  • trunk/themes/default/theme.css

    r10804 r10812  
    9090 */ 
    9191.content { 
    92         margin: 1em; 
    93 } 
    94  
    95 #theCategoryPage .content 
    96 { 
    9792        margin-left: 20em;  /* = #menubar width + 2em */ 
    9893} 
     
    412407} 
    413408 
     409/* only if menubar is shown */ 
     410.pictureContent { 
     411        margin-left:20em; 
     412} 
     413.pictureContent #imageToolBar,  
     414.pictureContent #theImage,  
     415.pictureContent hr.separation {  
     416        clear:none; 
     417} 
     418 
    414419 
    415420/** 
Note: See TracChangeset for help on using the changeset viewer.