Changeset 1827

Timestamp:

Feb 16, 2007, 4:06:41 AM (17 years ago)

Author:

rvelices

Message:

• adviser mode: added check on admin profile page and removed 2 read-only TAG_INPUT_ENABLED
• simplified tag code in picture.php
• reduced size of dark/theme.css by combining selectors with identical content

Location:

trunk

Files:

• admin/profile.php (modified) (2 diffs)
• picture.php (modified) (1 diff)
• template/yoga/admin/element_set_global.tpl (modified) (1 diff)
• template/yoga/admin/history.tpl (modified) (1 diff)
• template/yoga/admin/user_list.tpl (modified) (1 diff)
• template/yoga/theme/dark/theme.css (modified) (3 diffs)

trunk/admin/profile.php

@@ -33 +33 @@
 
 
-save_profile_from_post( $edit_user, $errors);
+$errors = array();
+if ( !is_adviser() )
+{
+  save_profile_from_post( $edit_user, $errors);
+}
 
 load_profile_in_template(
@@ -40 +44 @@
   $edit_user
   );
-$page['errors'] = array_merge( $page['errors'], $errors);
+$page['errors'] = array_merge($page['errors'], $errors );
 
 $template->set_filename('profile', 'admin/profile.tpl');

trunk/picture.php

@@ -749 +749 @@
 
 // tags
-$query = '
-SELECT id, name, url_name
-  FROM '.IMAGE_TAG_TABLE.'
-    INNER JOIN '.TAGS_TABLE.' ON tag_id = id
-  WHERE image_id = '.$page['image_id'].'
-;';
-$result = pwg_query($query);
-
-if (mysql_num_rows($result) > 0)
-{
-  $tags = array();
-  $tag_names = array();
-
-  while ($row = mysql_fetch_array($result))
-  {
-    array_push(
-      $tags,
-      '<a href="'
+$tags = get_common_tags( array($page['image_id']), -1);
+if ( count($tags) )
+{
+  $infos['INFO_TAGS'] = '';
+  foreach ($tags as $num => $tag)
+  {
+    $infos['INFO_TAGS'] .= $num ? ' ,' : '';
+    $infos['INFO_TAGS'] .= '<a href="'
       .make_index_url(
         array(
-          'tags' => array(
-            array(
-              'id' => $row['id'],
-              'url_name' => $row['url_name'],
-              ),
-            )
+          'tags' => array($tag)
           )
         )
-      .'">'.$row['name'].'</a>'
-      );
-    array_push( $tag_names, $row['name'] );
-  }
-
-  $infos['INFO_TAGS'] = implode(', ', $tags);
-  $header_infos['INFO_TAGS'] = implode(', ', $tag_names);
+      .'">'.$tag['name'].'</a>';
+  }
+  $header_infos['INFO_TAGS'] = strip_tags($infos['INFO_TAGS']);
 }
 else

trunk/template/yoga/admin/element_set_global.tpl

@@ -165 +165 @@
   </ul>
 
-  <p><input class="submit" type="submit" value="{L_SUBMIT}" name="submit_caddie" {TAG_INPUT_ENABLED}/></p>
+  <p><input class="submit" type="submit" value="{L_SUBMIT}" name="submit_caddie" /></p>
 
 </fieldset>

trunk/template/yoga/admin/history.tpl

@@ -83 +83 @@
   </label>
 
-  <input class="submit" type="submit" name="submit" value="{lang:submit}" {TAG_INPUT_ENABLED}/>
+  <input class="submit" type="submit" name="submit" value="{lang:submit}" />
 </fieldset>
 </form>

trunk/template/yoga/admin/user_list.tpl

@@ -59 +59 @@
   </label>
 
-  <input class="submit" type="submit" name="submit_filter" value="{lang:submit}" {TAG_INPUT_ENABLED}/>
+  <input class="submit" type="submit" name="submit_filter" value="{lang:submit}" />
 
 </fieldset>

trunk/template/yoga/theme/dark/theme.css

@@ -84 +84 @@
 }
 
-#content UL.thumbnails SPAN.wrap2:hover {
+#content UL.thumbnails SPAN.wrap2:hover,
+#content UL.thumbnailCategories DIV.thumbnailCategory:hover,
+#content UL.thumbnailCategories DIV.thumbnailCategory:hover A {
   background-color: AntiqueWhite;
   border-color: yellow;         /* thumbnails border color when mouse cursor is over it */
@@ -90 +92 @@
 }
 
-#content UL.thumbnailCategories DIV.thumbnailCategory:hover {
-  background-color: AntiqueWhite;
-  border-color: yellow;         /* thumbnails border color when mouse cursor is over it */
-  color: black;
-}
-
-#content UL.thumbnailCategories DIV.thumbnailCategory:hover A {
-  background-color: AntiqueWhite;
-  border-color: yellow;         /* thumbnails border color when mouse cursor is over it */
-  color: black;
-}
 
 /* links */
@@ -111 +102 @@
 }
 
-#imageToolBar A, #imageToolBar A:hover {
-  border-bottom: none;
-}
-
+#imageToolBar A, #imageToolBar A:hover,
 A.navThumb, A.navThumb:hover {
   border-bottom: none;