Changeset 5182


Ignore:
Timestamp:
03/18/10 23:12:30 (10 years ago)
Author:
plg
Message:

feature 1519: admin instructions are dispatched into several tabs. Only
applied to en_UK and fr_FR. The help content itself needs some updates
but it will be another set of commits, in this commit, I nearly only
modified the container.

The new "Add Photos" help page only introduces you to 3 main ways to add
photos: direct upload, pLoader and FTP. Each of them has a dedicated tab
on the Admin>Photos>Add screen.

No use of the big question mark icon linked to the Help pages in the
administration header, to avoid having this icon twice : in the header
+ in the content next to H2.

Location:
trunk
Files:
19 added
2 deleted
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/admin/help.php

    r3282 r5182  
    2323 
    2424include_once(PHPWG_ROOT_PATH.'admin/include/functions.php'); 
     25include_once(PHPWG_ROOT_PATH.'admin/include/tabsheet.class.php'); 
    2526 
    2627// +-----------------------------------------------------------------------+ 
     
    2930check_status(ACCESS_ADMINISTRATOR); 
    3031 
    31 $template->assign('ADMIN_CONTENT', load_language('help.html','',array('return'=>true)) ); 
     32$link = get_root_url().'admin.php?page=help&section='; 
     33$selected = null; 
     34$help_section_title = null; 
     35 
     36$tabs = array( 
     37  array( 
     38    'code' => 'add_photos', 
     39    'label' => 'Add Photos', 
     40    ), 
     41  array( 
     42    'code' => 'permissions', 
     43    'label' => 'Permissions', 
     44    ), 
     45  array( 
     46    'code' => 'groups', 
     47    'label' => 'Groups', 
     48    ), 
     49  array( 
     50    'code' => 'user_upload', 
     51    'label' => 'User Upload', 
     52    ), 
     53  array( 
     54    'code' => 'virtual_links', 
     55    'label' => 'Virtual Links', 
     56    ), 
     57  array( 
     58    'code' => 'misc', 
     59    'label' => 'Miscellaneous', 
     60    ), 
     61  ); 
     62 
     63if (!isset($_GET['section'])) 
     64{ 
     65  $section = $tabs[0]['code']; 
     66} 
     67else 
     68{ 
     69  $section = $_GET['section']; 
     70} 
     71 
     72$tabsheet = new tabsheet(); 
     73foreach ($tabs as $tab) 
     74{ 
     75  if ($tab['code'] == $section) 
     76  { 
     77    $selected_tab = $tab['code']; 
     78    $help_section_title = l10n($tab['label']); 
     79  } 
     80   
     81  $tabsheet->add($tab['code'], l10n($tab['label']), $link.$tab['code']); 
     82} 
     83$tabsheet->select($selected_tab); 
     84$tabsheet->assign(); 
     85 
     86$template->set_filenames(array('help' => 'help.tpl')); 
     87 
     88$template->assign( 
     89  array( 
     90    'HELP_CONTENT' => load_language( 
     91      'help/help_'.$selected_tab.'.html', 
     92      '', 
     93      array('return'=>true) 
     94      ), 
     95    'HELP_SECTION_TITLE' => $help_section_title, 
     96    ) 
     97  ); 
     98 
     99// +-----------------------------------------------------------------------+ 
     100// |                           sending html code                           | 
     101// +-----------------------------------------------------------------------+ 
     102 
     103$template->assign_var_from_handle('ADMIN_CONTENT', 'help'); 
    32104?> 
  • trunk/admin/photos_add.php

    r5089 r5182  
    148148    'code' => 'settings', 
    149149    'label' => 'Settings', 
    150     ) 
     150    ), 
     151  array( 
     152    'code' => 'ploader', 
     153    'label' => 'Piwigo Uploader', 
     154    ), 
     155  array( 
     156    'code' => 'ftp', 
     157    'label' => 'FTP + Synchronisation', 
     158    ), 
    151159  ); 
    152160 
  • trunk/admin/themes/clear/theme.css

    r5174 r5182  
    211211 
    212212#pluginsMenuSeparator {border:1px solid #ddd;} 
     213 
     214#helpContent A {border-bottom:1px dotted #005E89;} 
     215#helpContent A:hover {border-bottom:1px solid #d54e21;} 
  • trunk/admin/themes/default/default-layout.css

    r5174 r5182  
    541541 
    542542#pwgHead { 
    543   background-color:#222; 
     543  background-color:#464646; 
    544544  height:46px; 
    545545} 
     
    746746 
    747747#pluginsMenuSeparator {width:80%; margin:5px auto;} 
     748 
     749#helpContent P {text-align:left; margin-left:10px;} 
     750#helpContent LI, #ftpPage LI {margin-top:10px;} 
     751#helpContent P.nextStepLink {text-align:center; font-weight:bold; margin-bottom:20px;} 
  • trunk/admin/themes/default/template/header.tpl

    r5166 r5182  
    4949    Hello {$USERNAME} : 
    5050    <a href="{$U_RETURN}" title="Visit Gallery">Visit Gallery</a> | 
    51     <a href="{$U_CHANGE_THEME}" title="Switch to clear theme for administration">Change Theme</a> | 
     51    <a href="{$U_CHANGE_THEME}" title="Switch to clear theme for administration">Change Admin Colors</a> | 
     52    <a href="{$U_FAQ}" title="{'Instructions to use Piwigo'|@translate}">Help Me</a> | 
    5253    <a href="{$U_LOGOUT}">{'Logout'|@translate}</a> 
    53     <a href="{$U_FAQ}" title="{'Instructions'|@translate}" id="instructions"><img style="padding-left:10px;" src="{$ROOT_URL}admin/themes/default/icon/help.png" class="button" alt="(?)"></a> 
    5454  </div> 
    5555</div> 
  • trunk/admin/themes/roma/theme.css

    r5174 r5182  
    223223 
    224224#pluginsMenuSeparator {border:1px solid #333;} 
     225 
     226#helpContent, #pLoaderPage, #ftpPage, #ftpPage LEGEND {color:#aaa;} 
  • trunk/include/config_default.inc.php

    r5153 r5182  
    772772// directory with themes inside 
    773773$conf['themes_dir'] = PHPWG_ROOT_PATH.'themes'; 
     774 
     775// pLoader direct download url for windows 
     776$conf['ploader_download_windows'] = 'http://piwigo.org/ext/download.php?eid=270'; 
     777 
     778// pLoader direct download url for mac 
     779$conf['ploader_download_mac'] = 'http://piwigo.org/ext/download.php?eid=353'; 
     780 
     781// pLoader direct download url for linux 
     782$conf['ploader_download_linux'] = 'http://piwigo.org/ext/download.php?eid=269'; 
    774783?> 
Note: See TracChangeset for help on using the changeset viewer.