Changeset 836


Ignore:
Timestamp:
Aug 19, 2005, 9:07:13 PM (19 years ago)
Author:
plg
Message:
  • improvement : less compact presentation of screen admin/element_set_unit.
Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/admin/element_set_unit.php

    r834 r836  
    4646  $collection = explode(',', $_POST['list']);
    4747 
    48 //   echo '<pre>';
    49 //   print_r($_POST);
    50 //   echo '</pre>';
    51 //   exit();
    52 
    5348  $datas = array();
    54   $dbfields =
    55     array(
    56       'primary' => array('id'),
    57       'update' => array('name','author','comment','date_creation','keywords')
    58       );
    5949 
    6050  $query = '
     
    6858  {
    6959    $data = array();
    70     $data['id'] = $row['id'];
    71    
    72     foreach (array_diff($dbfields['update'], array('date_creation')) as $field)
     60
     61    $data{'id'} = $row['id'];
     62    $data{'name'} = $_POST['name-'.$row['id']];
     63    $data{'author'} = $_POST['author-'.$row['id']];
     64
     65    foreach (array('name', 'author') as $field)
    7366    {
    7467      if (!empty($_POST[$field.'-'.$row['id']]))
    7568      {
    76         $data[$field] = $_POST[$field.'-'.$row['id']];
     69        $data{$field} = strip_tags($_POST[$field.'-'.$row['id']]);
    7770      }
    7871    }
    79 
    80     if ('set' == $_POST['date_creation_action-'.$row['id']])
    81     {
    82       $data['date_creation'] =
    83         $_POST['date_creation_year-'.$row['id']]
    84         .'-'.$_POST['date_creation_month-'.$row['id']]
    85         .'-'.$_POST['date_creation_day-'.$row['id']]
    86         ;
    87     }
    88     else if ('leave' == $_POST['date_creation_action-'.$row['id']]
    89              and !empty($row['date_creation']))
    90     {
    91       $data['date_creation'] = $row['date_creation'];
     72   
     73    if ($conf['allow_html_descriptions'])
     74    {
     75      $data{'comment'} = @$_POST['description-'.$row['id']];
     76    }
     77    else
     78    {
     79      $data{'comment'} = strip_tags(@$_POST['description-'.$row['id']]);
     80    }
     81
     82    if (isset($_POST['date_creation_action-'.$row['id']]))
     83    {
     84      if ('set' == $_POST['date_creation_action-'.$row['id']])
     85      {
     86        $data{'date_creation'} =
     87          $_POST['date_creation_year-'.$row['id']]
     88            .'-'.$_POST['date_creation_month-'.$row['id']]
     89            .'-'.$_POST['date_creation_day-'.$row['id']];
     90      }
     91      else if ('unset' == $_POST['date_creation_action-'.$row['id']])
     92      {
     93        $data{'date_creation'} = '';
     94      }
     95    }
     96    else
     97    {
     98      $data{'date_creation'} = $row['date_creation'];
     99    }
     100
     101    $keywords = get_keywords($_POST['keywords-'.$row['id']]);
     102    if (count($keywords) > 0)
     103    {
     104      $data{'keywords'} = implode(',', $keywords);
     105    }
     106    else
     107    {
     108      $data{'keywords'} = '';
    92109    }
    93110
    94111    array_push($datas, $data);
    95112  }
    96   // echo '<pre>'; print_r($datas); echo '</pre>';
    97   mass_updates(IMAGES_TABLE, $dbfields, $datas);
     113 
     114  mass_updates(
     115    IMAGES_TABLE,
     116    array(
     117      'primary' => array('id'),
     118      'update' => array('name','author','comment','date_creation','keywords')
     119      ),
     120    $datas
     121    );
     122 
     123  array_push($page['infos'], l10n('Picture informations updated'));
    98124}
    99125
     
    149175
    150176  $query = '
    151 SELECT id,path,tn_ext,name,date_creation,comment,keywords,author
     177SELECT id,path,tn_ext,name,date_creation,comment,keywords,author,file
    152178  FROM '.IMAGES_TABLE.'
    153179  WHERE id IN ('.implode(',', $page['cat_elements_id']).')
     
    177203      'element',
    178204      array(
     205        'LEGEND' =>
     206          !empty($row['name']) ?
     207            $row['name'] : get_name_from_file($row['file']),
     208        'U_EDIT' =>
     209          add_session_id(
     210            PHPWG_ROOT_PATH.'admin.php?page=picture_modify'.
     211            '&amp;image_id='.$row['id']
     212            ),
    179213        'ID' => $row['id'],
    180214        'FILENAME' => $row['path'],
     
    182216        'NAME' => @$row['name'],
    183217        'AUTHOR' => @$row['author'],
    184         'COMMENT' => @$row['comment'],
     218        'DESCRIPTION' => @$row['comment'],
    185219        'DATE_CREATION_YEAR' => $year,
    186220        'KEYWORDS' => @$row['keywords']
  • trunk/doc/ChangeLog

    r834 r836  
     12005-08-19 Pierrick LE GALL
     2
     3        * improvement : less compact presentation of screen
     4        admin/element_set_unit.
     5
    162005-08-19 Pierrick LE GALL
    27
  • trunk/template/default/admin/cat_modify.tpl

    r817 r836  
    4343      <td><strong>{L_EDIT_COMMENT}</strong></td>
    4444      <td>
    45         <textarea name="comment" rows="3" cols="50" >{CAT_COMMENT}</textarea>
     45        <textarea name="comment" class="description">{CAT_COMMENT}</textarea>
    4646      </td>
    4747    </tr>
  • trunk/template/default/admin/element_set_unit.tpl

    r834 r836  
    2525</fieldset>
    2626
    27 <fieldset>
     27<div class="navigationBar">{NAV_BAR}</div>
    2828
    29   <legend>Elements</legend>
     29<!-- BEGIN element -->
     30<fieldset class="elementEdit">
     31  <legend>{element.LEGEND}</legend>
    3032
    31   <div class="navigationBar">{NAV_BAR}</div>
     33  <a href="{element.U_EDIT}"><img src="{element.TN_SRC}" alt="" class="miniature" title="{lang:Edit all picture informations}" /></a>
    3234
    33   <table width="100%">
     35  <table>
    3436
    3537    <tr>
    36       <th class="row2" style="text-align:center;">&nbsp;</td>
    37       <th class="row2" style="text-align:center;">name</td>
    38       <th class="row2" style="text-align:center;">author</td>
    39       <th class="row2" style="text-align:center;">description</td>
    40       <th class="row2" style="text-align:center;">creation date</td>
    41       <th class="row2" style="text-align:center;">keywords</td>
     38      <td><strong>{lang:Name}</strong></td>
     39      <td><input type="text" name="name-{element.ID}" value="{element.NAME}" /></td>
    4240    </tr>
    4341
    44     <!-- BEGIN element -->
    4542    <tr>
     43      <td><strong>{lang:Author}</strong></td>
     44      <td><input type="text" name="author-{element.ID}" value="{element.AUTHOR}" /></td>
     45    </tr>
    4646
    47       <td style="text-align:center;"><img src="{element.TN_SRC}" alt="" class="miniature" title="{element.FILENAME}" /></td>
    48 
    49       <td style="text-align:center;"><input type="text" name="name-{element.ID}" value="{element.NAME}" maxlength="255"/></td>
    50 
    51       <td style="text-align:center;"><input type="text" name="author-{element.ID}" value="{element.AUTHOR}" maxlength="255" size="12" /></td>
    52 
    53       <td style="text-align:center;"><textarea name="comment-{element.ID}" rows="5" cols="30" style="overflow:auto">{element.COMMENT}</textarea></td>
    54 
    55       <td style="text-align:left;">
    56         <input type="radio" name="date_creation_action-{element.ID}" value="leave" checked="checked" /> leave unchanged
    57         <br /><input type="radio" name="date_creation_action-{element.ID}" value="unset" /> unset
    58         <br /><input type="radio" name="date_creation_action-{element.ID}" value="set" id="date_creation_action_set-{element.ID}" />
    59 
     47    <tr>
     48      <td><strong>{lang:Creation date}</strong></td>
     49      <td>
     50        <label><input type="radio" name="date_creation_action-{element.ID}" value="unset" /> unset</label>
     51        <input type="radio" name="date_creation_action-{element.ID}" value="set" id="date_creation_action_set-{element.ID}" /> set to
    6052        <select onmousedown="document.getElementById('date_creation_action_set-{element.ID}').checked = true;" name="date_creation_day-{element.ID}">
    6153          <!-- BEGIN date_creation_day -->
     
    7567               value="{element.DATE_CREATION_YEAR}" />
    7668      </td>
     69    </tr>
    7770
    78       <td style="text-align:center;"><input type="text" name="keywords-{element.ID}" value="{element.KEYWORDS}" length="255" /></td>
     71    <tr>
     72      <td><strong>{lang:Keywords}</strong></td>
     73      <td><input type="text" name="keywords-{element.ID}" value="{element.KEYWORDS}" size="50" /></td>
     74    </tr>
    7975
     76    <tr>
     77      <td><strong>{lang:Description}</strong></td>
     78      <td><textarea name="description-{element.ID}" class="description">{element.DESCRIPTION}</textarea></td>
    8079    </tr>
    81     <!-- END element -->
    8280
    8381  </table>
    8482
    85   <p style="text-align:center;">
    86     <input type="submit" value="{L_SUBMIT}" name="submit" class="bouton" />
    87   </p>
     83</fieldset>
     84<!-- END element -->
    8885
    89 </fieldset>
     86<p style="text-align:center;">
     87  <input type="submit" value="{L_SUBMIT}" name="submit" />
     88  <input type="reset" value="{lang:Reset}" />
     89</p>
     90
    9091
    9192</form>
  • trunk/template/default/admin/picture_modify.tpl

    r825 r836  
    105105      <tr>
    106106        <td><strong>{lang:Description}</strong></td>
    107         <td><textarea name="description" rows="5" cols="50" style="overflow:auto">{DESCRIPTION}</textarea></td>
     107        <td><textarea name="description" class="description">{DESCRIPTION}</textarea></td>
    108108      </tr>
    109109
  • trunk/template/default/default.css

    r825 r836  
    617617  display: block;
    618618}
     619
     620textarea.description {
     621  height: 100px;
     622  width: 500px;
     623  overflow: auto;
     624}
     625
     626fieldset.elementEdit>a {
     627  display: block;
     628  float: right;
     629}
Note: See TracChangeset for help on using the changeset viewer.