Changeset 539


Ignore:
Timestamp:
Oct 2, 2004, 12:50:50 AM (20 years ago)
Author:
gweltas
Message:
  • Change of the picture page behavior to be able to open the full size image in a new window
  • Minor modification for template migration
  • Rename of script.js in scripts.js
Location:
trunk
Files:
2 added
2 deleted
11 edited

Legend:

Unmodified
Added
Removed
  • trunk/about.php

    r393 r539  
    4040        'PAGE_TITLE' => $title,
    4141        'L_ABOUT' => $lang['about_message'],
    42         'L_RETURN' =>  $lang['about_return'],
     42        'L_RETURN' =>  $lang['return_main_page'],
    4343        'U_RETURN' => add_session_id(PHPWG_ROOT_PATH.'category.php?'.$_SERVER['QUERY_STRING'])
    4444        )
  • trunk/admin.php

    r528 r539  
    4343   $title = $lang['title_modify'];        $page_valide = true; break;
    4444 case 'user_search':
    45   /* if ( !is_numeric( $_GET['user_id'] ) ) $_GET['user_id'] = -1;
    46    $query = 'SELECT status,username';
    47    $query.= ' FROM '.USERS_TABLE;
    48    $query.= ' WHERE id = '.$_GET['user_id'];
    49    $query.= ';';
    50    $result = mysql_query( $query );
    51    if ( mysql_num_rows( $result ) > 0 )
    52    {
    53      $row = mysql_fetch_array( $result );
    54      $page['user_status']   = $row['status'];
    55      if ( $row['username'] == 'guest' ) $row['username'] = $lang['guest'];
    56      $page['user_username'] = $row['username'];
    57      $page_valide = true;
    58      $title = $lang['title_user_perm'].' "'.$page['user_username'].'"';
    59    }
    60    else
    61    {
    62      $page_valide = false;
    63    }*/
    64    $title = $lang['title_user_perm'];
    65    //.' '.$_POST['username'];
     45   $username='';
     46   if (isset($_POST['username'])) $username=$_POST['username'];
     47   $title = $lang['title_user_perm'].' '.$username;
    6648   $page_valide = true; break;
    6749 case 'group_list' :
  • trunk/admin/stats.php

    r537 r539  
    3131include_once( PHPWG_ROOT_PATH.'admin/include/isadmin.inc.php' );
    3232
    33 $url_img_monthly_report = PHPWG_ROOT_PATH.'/admin/images/monthly_visits.img.php';
     33$url_img_global_report = PHPWG_ROOT_PATH.'admin/images/global_stats.img.php';
    3434//----------------------------------------------------- template initialization
    3535$template->set_filenames( array('stats'=>'admin/stats.tpl') );
     
    3838  'L_STAT_TITLE'=>$lang['stats_last_days'],
    3939  'L_STAT_MONTHLY_ALT'=>$lang['stats_pages_seen_graph_title'],
    40   'IMG_MONTHLY_REPORT'=>add_session_id($url_img_monthly_report)
     40  'IMG_MONTHLY_REPORT'=>add_session_id($url_img_global_report)
    4141  ));
    4242
  • trunk/admin/user_search.php

    r393 r539  
    6565  }
    6666  check_favorites( $_GET['user_id'] );
    67   synchronize_user( $_GET['user_id'] );
    6867}
    6968
    7069$user_id = (!empty($userdata['id']))?$userdata['id']:'';
    71  
    7270$template->set_filenames( array('user'=>'admin/user_perm.tpl') );
    7371$template->assign_vars(array(
     
    7775  'L_AUTH_USER'=>$lang['permuser_only_private'],
    7876  'L_SUBMIT'=>$lang['submit'],
    79   'L_AUTHORIZED'=>$lang['permuser_authorized'],
    80   'L_FORBIDDEN'=>$lang['permuser_forbidden'],
     77  'L_AUTHORIZED'=>$lang['authorized'],
     78  'L_FORBIDDEN'=>$lang['forbidden'],
    8179  'L_PARENT_FORBIDDEN'=>$lang['permuser_parent_forbidden'],
    8280
  • trunk/language/en_UK.iso-8859-1/common.lang.php

    r536 r539  
    3434
    3535// Main words
    36 $lang['gallery_index'] = 'Gallery index';
     36$lang['gallery_index'] = 'Home';
    3737$lang['category'] = 'Category';
    3838$lang['categories'] = 'Categories';
     
    185185  <li>If you have any suggestions or comments, please visit <a href="http://www.phpwebgallery.net" style="text-decoration:underline">PhpWebGallery</a> official site, and its dedicated <a href="http://forum.phpwebgallery.net" style="text-decoration:underline">forum</a>.</li>
    186186</ul>';
    187 $lang['about_return'] = 'Back';
    188187$lang['ident_page_title'] = 'Identification';
    189188$lang['ident_title'] = 'Identification';
     
    194193$lang['previous_image'] = 'Previous';
    195194$lang['next_image'] = 'Next';
    196 $lang['back'] = 'Click on the image to go back to the thumbnails page';
    197195$lang['info_image_title'] = 'Image information';
    198196$lang['link_info_image'] = 'Modify information';
     
    294292$lang['random_cat'] = 'random pictures';
    295293$lang['random_cat_hint'] = 'Displays a set of random pictures';
    296 $lang['picture_high'] = 'See high quality picture';
    297 $lang['picture_high_alt'] = 'high';
     294$lang['picture_high'] = 'Click on the picture to see it in high definition';
    298295?>
  • trunk/language/fr_FR.iso-8859-1/common.lang.php

    r532 r539  
    3434
    3535// Main words
    36 $lang['gallery_index'] = 'Racine de la galerie';
     36$lang['gallery_index'] = 'Accueil';
    3737$lang['category'] = 'Catégorie';
    3838$lang['categories'] = 'Catégories';
     
    200200$lang['previous_image'] = 'Précédent';
    201201$lang['next_image'] = 'Suivant';
    202 $lang['back'] = 'Cliquez sur l\'image pour revenir à la page des miniatures';
    203202$lang['info_image_title'] = 'Informations';
    204203$lang['link_info_image'] = 'Modifier les informations de cette image';
     
    313312$lang['rates'] = 'Votes';
    314313$lang['standard_deviation'] = 'STD';
     314$lang['picture_high'] = 'Cliquez sur l\'image pour la voir en haute résolution';
    315315?>
  • trunk/picture.php

    r536 r539  
    451451  'HEIGHT_IMG' => $picture_size[1],
    452452
     453  'L_HOME' => $lang['gallery_index'],
    453454  'L_SLIDESHOW' => $lang['slideshow'],
    454   'L_TIME' => $lang['period_seconds'],
    455455  'L_STOP_SLIDESHOW' => $lang['slideshow_stop'],
    456456  'L_PREV_IMG' =>$lang['previous_image'].' : ',
    457457  'L_ADMIN' =>$lang['link_info_image'],
    458   'L_BACK' =>$lang['back'],
    459458  'L_COMMENT_TITLE' =>$lang['comments_title'],
    460459  'L_ADD_COMMENT' =>$lang['comments_add'],
     
    468467  'L_PICTURE_METADATA' => $lang['picture_show_metadata'],
    469468  'L_PICTURE_HIGH' => $lang['picture_high'],
    470   'L_PICTURE_HIGH_ALT' => $lang['picture_high_alt'],
    471469 
    472470  'U_HOME' => add_session_id($url_home),
     
    494492if (isset($picture['current']['high']))
    495493{
    496   $template->assign_block_vars(
    497     'high',
    498     array('U_HIGH' => $picture['current']['high']));
     494  $full_size = @getimagesize($picture['current']['high']);
     495  $full_width = $full_size[0];
     496  $full_height = $full_size[1];
     497  $uuid = uniqid(rand());
     498  $template->assign_block_vars('high', array(
     499    'U_HIGH' => $picture['current']['high'],
     500        'UUID'=>$uuid,
     501        'WIDTH_IMG'=>($full_width + 16),
     502        'HEIGHT_IMG'=>($full_height + 16)
     503        ));
    499504}
    500505//------------------------------------------------------- favorite manipulation
  • trunk/template/default/admin/user_perm.tpl

    r393 r539  
    99<!-- END search -->
    1010<!-- BEGIN permission -->
    11 <div class="admin">{L_AUTH_USER}</div>
     11<div class="admin">{L_AUTH_USER} {USERNAME}</div>
    1212<form action="{F_AUTH_ACTION}" method="POST">
    1313  <ul class="menu">
    1414    <!-- BEGIN category -->
    15         <li> <a href="{permission.category.CAT_URL}"><span style="color:{#color}">{permission.category.CAT_NAME}</span></a>
     15        <li> <a href="{permission.category.CAT_URL}">{permission.category.CAT_NAME}</a>
    1616        <!-- BEGIN parent_forbidden -->
    1717        {L_PARENT_FORBIDDEN}&nbsp;-&nbsp;
  • trunk/template/default/category.tpl

    r533 r539  
    1 <div align="center" style="padding:10px;"><img src="template/default/images/logo.jpg" width="360" height="100"></div>
     1<div style="padding:3px;"><img src="template/default/images/logo.jpg"></div>
    22<table style="width:100%;">
    33  <tr>
     
    6262                        <div class="titrePage">{TITLE}</div>
    6363                        <!-- BEGIN calendar -->
    64                           <div class="navigationBar">{calendar.YEARS_NAV_BAR}</div>
     64               <div class="navigationBar">{calendar.YEARS_NAV_BAR}</div>
    6565                          <div class="navigationBar">{calendar.MONTHS_NAV_BAR}</div>
    6666                        <!-- END calendar -->
     
    7777                                           class="thumbLink" />
    7878                                  <br />
    79                                   <!-- BEGIN bullet -->
    80                                   <img src="./template/default/theme/collapsed.gif" style="border:none;" alt="&gt;" />
    81                                   <!-- END bullet -->
    8279                                  <span class="{thumbnails.line.thumbnail.IMAGE_STYLE}">{thumbnails.line.thumbnail.IMAGE_NAME}</span></a>
    8380                                  {thumbnails.line.thumbnail.IMAGE_TS}
  • trunk/template/default/default.css

    r534 r539  
    33{
    44  float:left;
    5   width:18%;
     5  width:30%;
    66  text-align:left;
    77}
     
    1010{
    1111  float:left;
    12   width:64%;
     12  width:40%;
    1313  text-align:center;
    1414}
     
    188188  border: 1px solid #000000;
    189189  background-color:#555555;
     190  display:block;
    190191}
    191192
  • trunk/template/default/picture.tpl

    r536 r539  
    33<!-- END information -->
    44<div class="titrePage">
    5   <div id="gauche">{CATEGORY}</div>
     5  <div id="gauche"><a href="{U_HOME}">{L_HOME}</a> > {CATEGORY}</div>
    66  <div id="centre" class="nameImage">{TITLE}</div>
    77  <div id="droite">{PHOTO}</div>
     
    2424  </a>
    2525</div>
    26 <!-- BEGIN high -->
    27 <div class="imgMenu" id="left">
    28   <a href="{high.U_HIGH}" title="{L_PICTURE_HIGH}">
    29         <img src="template/default/theme/high.gif" alt="{L_PICTURE_HIGH_ALT}" />
    30   </a>
    31 </div>
    32 <!-- END high -->
    3326<!-- BEGIN favorite -->
    3427<div class="imgMenu" id="right">
     
    6053<!-- END admin -->
    6154</div>
    62 
    63 <a href="{U_HOME}">
     55<!-- BEGIN high -->
     56<a href="javascript:phpWGOpenWindow('{high.U_HIGH}','{high.UUID}','scrollbars=yes,toolbar=yes,status=yes,resizable=yes,width={high.WIDTH_IMG},height={high.HEIGHT_IMG}')">
     57<!-- END high -->
    6458  <img class="image" src="{SRC_IMG}" style="width:{WIDTH_IMG}px;height:{HEIGHT_IMG}px;" alt="{ALT_IMG}"/>
     59<!-- BEGIN high -->
    6560</a>
     61<div style="text-align:center;font-weight:bold;">{L_PICTURE_HIGH}</div>
     62<!-- END high -->
    6663<!-- BEGIN legend -->
    6764<div class="commentImage">{legend.COMMENT_IMG}</div>
     
    127124          </div>
    128125          <!-- END rate -->
    129  
    130 
    131           <div style="text-align:center;">{L_BACK}</div>
     126         
    132127<table class="tablecompact">
    133128      <!-- BEGIN comments -->
Note: See TracChangeset for help on using the changeset viewer.