Changeset 12877


Ignore:
Timestamp:
Jan 12, 2012, 6:57:43 AM (9 years ago)
Author:
rvelices
Message:

remove max photo width/height from user profile because not used anymore

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/admin/profile.php

    r8728 r12877  
    33// | Piwigo - a PHP based photo gallery                                    |
    44// +-----------------------------------------------------------------------+
    5 // | Copyright(C) 2008-2011 Piwigo Team                  http://piwigo.org |
     5// | Copyright(C) 2008-2012 Piwigo Team                  http://piwigo.org |
    66// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
    77// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
  • trunk/admin/themes/default/template/profile_content.tpl

    r12470 r12877  
    8282        {html_radios name='show_nb_hits' options=$radio_options selected=$NB_HITS}
    8383      </li>
    84       <li>
    85         <span class="property">
    86           <label for="maxwidth">{'Maximum photo width'|@translate}</label>
    87         </span>
    88         <input type="text" size="4" maxlength="4" name="maxwidth" id="maxwidth" value="{$MAXWIDTH}">
    89       </li>
    90       <li>
    91         <span class="property">
    92           <label for="maxheight">{'Maximum photo height'|@translate}</label>
    93         </span>
    94         <input type="text" size="4" maxlength="4" name="maxheight" id="maxheight" value="{$MAXHEIGHT}">
    95       </li>
    9684    </ul>
    9785  </fieldset>
  • trunk/admin/themes/default/template/user_list.tpl

    r12482 r12877  
    255255  </tr>
    256256
    257   <tr>
    258     <td>{'Maximum photo width'|@translate}</td>
    259     <td>
    260       <label><input type="radio" name="maxwidth_action" value="leave" checked="checked"> {'leave'|@translate}</label>
    261       <label><input type="radio" name="maxwidth_action" value="unset"> {'unset'|@translate}</label>
    262       <label><input type="radio" name="maxwidth_action" value="set" id="maxwidth_action_set"> {'set to'|@translate}</label>
    263       <input onmousedown="document.getElementById('maxwidth_action_set').checked = true;"
    264              type="text" size="4" maxlength="4" name="maxwidth" value="{$MAXWIDTH}">
    265     </td>
    266   </tr>
    267 
    268 
    269   <tr>
    270     <td>{'Maximum photo height'|@translate}</td>
    271     <td>
    272       <label><input type="radio" name="maxheight_action" value="leave" checked="checked"> {'leave'|@translate}</label>
    273       <label><input type="radio" name="maxheight_action" value="unset"> {'unset'|@translate}</label>
    274       <label><input type="radio" name="maxheight_action" value="set" id="maxheight_action_set"> {'set to'|@translate}</label>
    275       <input onmousedown="document.getElementById('maxheight_action_set').checked = true;"
    276              type="text" size="4" maxlength="4" name="maxheight" value="{$MAXHEIGHT}">
    277     </td>
    278   </tr>
    279 
    280 
    281257</table>
    282258
  • trunk/admin/user_list.php

    r12681 r12877  
    386386  $formfields =
    387387    array('nb_image_page', 'theme', 'language',
    388           'recent_period', 'maxwidth', 'expand', 'show_nb_comments',
    389           'show_nb_hits', 'maxheight', 'status', 'enabled_high',
     388          'recent_period', 'expand', 'show_nb_comments',
     389          'show_nb_hits', 'status', 'enabled_high',
    390390          'level');
    391391
     
    561561    array(
    562562      'NB_IMAGE_PAGE' => $_POST['nb_image_page'],
    563       'MAXWIDTH' => $_POST['maxwidth'],
    564       'MAXHEIGHT' => $_POST['maxheight'],
    565563      'RECENT_PERIOD' => $_POST['recent_period'],
    566564      ));
     
    572570    array(
    573571      'NB_IMAGE_PAGE' => $default_user['nb_image_page'],
    574       'MAXWIDTH' => $default_user['maxwidth'],
    575       'MAXHEIGHT' => $default_user['maxheight'],
    576572      'RECENT_PERIOD' => $default_user['recent_period'],
    577573      ));
  • trunk/profile.php

    r12764 r12877  
    5050  {
    5151    $fields = array(
    52       'nb_image_page', 'maxwidth', 'maxheight', 'expand',
     52      'nb_image_page', 'expand',
    5353      'show_nb_comments', 'show_nb_hits', 'recent_period', 'show_nb_hits'
    5454      );
     
    125125    }
    126126
    127     if ($_POST['maxwidth'] != ''
    128         and (!preg_match($int_pattern, $_POST['maxwidth'])
    129              or $_POST['maxwidth'] < 50))
    130     {
    131       $errors[] = l10n('Maximum width must be a number superior to 50');
    132     }
    133     if ($_POST['maxheight']
    134          and (!preg_match($int_pattern, $_POST['maxheight'])
    135                or $_POST['maxheight'] < 50))
    136     {
    137       $errors[] = l10n('Maximum height must be a number superior to 50');
    138     }
    139127    // periods must be integer values, they represents number of days
    140128    if (!preg_match($int_pattern, $_POST['recent_period'])
     
    222210      // update user "additional" informations (specific to Piwigo)
    223211      $fields = array(
    224         'nb_image_page', 'language', 'maxwidth', 'maxheight',
     212        'nb_image_page', 'language',
    225213        'expand', 'show_nb_comments', 'show_nb_hits', 'recent_period', 'theme'
    226214        );
     
    269257      'NB_IMAGE_PAGE'=>$userdata['nb_image_page'],
    270258      'RECENT_PERIOD'=>$userdata['recent_period'],
    271       'MAXWIDTH'=>@$userdata['maxwidth'],
    272       'MAXHEIGHT'=>@$userdata['maxheight'],
    273259      'EXPAND' =>$userdata['expand'] ? 'true' : 'false',
    274260      'NB_COMMENTS'=>$userdata['show_nb_comments'] ? 'true' : 'false',
  • trunk/themes/default/template/profile_content.tpl

    r12470 r12877  
    8181        {html_radios name='show_nb_hits' options=$radio_options selected=$NB_HITS}
    8282      </li>
    83       <li>
    84         <span class="property">
    85           <label for="maxwidth">{'Maximum photo width'|@translate}</label>
    86         </span>
    87         <input type="text" size="4" maxlength="4" name="maxwidth" id="maxwidth" value="{$MAXWIDTH}">
    88       </li>
    89       <li>
    90         <span class="property">
    91           <label for="maxheight">{'Maximum photo height'|@translate}</label>
    92         </span>
    93         <input type="text" size="4" maxlength="4" name="maxheight" id="maxheight" value="{$MAXHEIGHT}">
    94       </li>
    9583    </ul>
    9684  </fieldset>
Note: See TracChangeset for help on using the changeset viewer.