Changeset 26665

Timestamp:

Jan 12, 2014, 7:13:40 PM (10 years ago)

Author:

mistic100

Message:

integrate in new tags manager + rename in Coloured Tags
(my apologies to translators :-) )

Location:

extensions/typetags

Files:

• admin (deleted)
• admin.php (modified) (7 diffs)
• include (added)
• include/events_admin.inc.php (added)
• include/events_public.inc.php (moved) (moved from extensions/typetags/typetags.php) (4 diffs)
• include/functions.inc.php (added)
• include/index.php (added)
• language/ca_ES/plugin.lang.php (modified) (1 diff)
• language/cs_CZ/plugin.lang.php (modified) (1 diff)
• language/da_DK/plugin.lang.php (modified) (1 diff)
• language/de_DE/plugin.lang.php (modified) (1 diff)
• language/el_GR/plugin.lang.php (modified) (1 diff)
• language/en_UK/plugin.lang.php (modified) (1 diff)
• language/es_ES/plugin.lang.php (modified) (1 diff)
• language/fr_FR/plugin.lang.php (modified) (1 diff)
• language/gl_ES/plugin.lang.php (modified) (1 diff)
• language/hu_HU/plugin.lang.php (modified) (1 diff)
• language/it_IT/plugin.lang.php (modified) (1 diff)
• language/lv_LV/plugin.lang.php (modified) (1 diff)
• language/nb_NO/plugin.lang.php (modified) (1 diff)
• language/nl_NL/plugin.lang.php (modified) (1 diff)
• language/pl_PL/plugin.lang.php (modified) (1 diff)
• language/pt_BR/plugin.lang.php (modified) (1 diff)
• language/pt_PT/plugin.lang.php (modified) (1 diff)
• language/ru_RU/plugin.lang.php (modified) (1 diff)
• language/sk_SK/plugin.lang.php (modified) (1 diff)
• language/tr_TR/plugin.lang.php (modified) (1 diff)
• language/uk_UA/plugin.lang.php (modified) (1 diff)
• language/zh_CN/plugin.lang.php (modified) (1 diff)
• language/zh_TW/plugin.lang.php (modified) (1 diff)
• main.inc.php (modified) (2 diffs)
• maintain.inc.php (modified) (2 diffs)
• template (added)
• template/admin.tpl (copied) (copied from extensions/typetags/admin/typetags_admin.tpl) (2 diffs)
• template/farbtastic (copied) (copied from extensions/typetags/admin/farbtastic)
• template/index.php (added)
• template/style.css (added)
• template/tags.tpl (added)

extensions/typetags/admin.php

@@ -1 +1 @@
 <?php
-if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
-
-load_language('plugin.lang', typetags_PATH);
-
-function get_color_text($color)
-{
-  if (strlen($color) == 7)
-  {
-    $rgb[] = hexdec(substr($color, 1, 2))/255;
-    $rgb[] = hexdec(substr($color, 3, 2))/255;
-    $rgb[] = hexdec(substr($color, 5, 2))/255;
-  }
-  else if (strlen($color) == 4)
-  {
-    $rgb[] = hexdec(substr($color, 1, 1))/15;
-    $rgb[] = hexdec(substr($color, 2, 1))/15;
-    $rgb[] = hexdec(substr($color, 3, 1))/15;
-  }
-  $l = (min($rgb) + max($rgb)) / 2;
-  return $l > 0.45 ? '#000' : '#fff';
-}
+defined('TYPETAGS_PATH') or die('Hacking attempt!');
+
+load_language('plugin.lang', TYPETAGS_PATH);
+
+include_once(TYPETAGS_PATH . 'include/functions.inc.php');
+
 
 // +-----------------------------------------------------------------------+
 // |                                edit typetags                          |
 // +-----------------------------------------------------------------------+
-
-if ( isset($_POST['edittypetag']) and (empty($_POST['typetag_name']) or empty($_POST['typetag_color'])) )
-{
-  $edited_typetag = array(
-    'id' => $_POST['edited_typetag'],
-    'name' => $_POST['typetag_name'],
-    'color' => $_POST['typetag_color'],
-  );
-  
-  array_push($page['errors'],  l10n('typetag_error'));
-}
-else if (isset($_POST['edittypetag']))
-{
-  // we must not rename typetag with an already existing name
-  $query = '
+if (isset($_POST['edittypetag']))
+{
+  if (empty($_POST['typetag_name']) or empty($_POST['typetag_color']))
+  {
+    $page['errors'][] = l10n('You must fill all fields (name and color)');
+  }
+  else
+  {
+    // we must not rename typetag with an already existing name
+    $query = '
 SELECT id
-  FROM '.typetags_TABLE.'
+  FROM ' . TYPETAGS_TABLE . '
   WHERE
-    name = "'.$_POST['typetag_name'].'"
-    AND id != '.$_POST['edited_typetag'].'
-;';
-
-  if ( pwg_db_num_rows(pwg_query($query)) )
+    name = "' . pwg_db_real_escape_string($_POST['typetag_name']) . '"
+    AND id != ' . $_POST['edited_typetag'] . '
+;';
+
+    if (pwg_db_num_rows(pwg_query($query)))
+    {
+      $page['errors'][] = l10n('This name is already used');
+    }
+    else if ( ($color = check_color($_POST['typetag_color'])) === false )
+    {
+      $page['errors'][] = l10n('Invalid color');
+    }
+    else
+    {
+      $query = '
+UPDATE '.TYPETAGS_TABLE.'
+  SET
+    name = "' . pwg_db_real_escape_string($_POST['typetag_name']) . '",
+    color = "' . $color . '"
+  WHERE id = ' . $_POST['edited_typetag'] . '
+;';
+      pwg_query($query);
+
+      $page['infos'][] = l10n('Color saved');
+    }
+  }
+
+  if (count($page['errors']))
   {
     $edited_typetag = array(
@@ -53 +56 @@
       'name' => $_POST['typetag_name'],
       'color' => $_POST['typetag_color'],
-    );
-    
-    array_push($page['errors'], l10n('typetag_already_exists'));
+      );
+  }
+}
+
+// +-----------------------------------------------------------------------+
+// |                           delete typetags                             |
+// +-----------------------------------------------------------------------+
+if (isset($_GET['deletetypetag']))
+{
+  $query = '
+UPDATE ' . TAGS_TABLE . '
+  SET id_typetags = NULL
+  WHERE id_typetags = ' . intval($_GET['deletetypetag']) . '
+;';
+  pwg_query($query);
+
+  $query = '
+DELETE FROM ' . TYPETAGS_TABLE . '
+  WHERE id = ' . intval($_GET['deletetypetag']) . '
+;';
+  pwg_query($query);
+
+  if (pwg_db_changes())
+  {
+    $page['infos'][] = l10n('Color deleted');
+  }
+}
+
+// +-----------------------------------------------------------------------+
+// |                               add a typetag                           |
+// +-----------------------------------------------------------------------+
+if (isset($_POST['addtypetag']))
+{
+  if (empty($_POST['typetag_name']) or empty($_POST['typetag_color']))
+  {
+    $page['errors'][] = l10n('You must fill all fields (name and color)');
   }
   else
   {
+    $typetag_name = $_POST['typetag_name'];
+    $typetag_color = $_POST['typetag_color'];
+
+    // does the tag already exists?
     $query = '
-UPDATE '.typetags_TABLE.'
-  SET 
-    name = "'.$_POST['typetag_name'].'",
-    color = "'.$_POST['typetag_color'].'"
-  WHERE id = '.$_POST['edited_typetag'].'
-;';
-    pwg_query($query);
-    
-    array_push($page['infos'], l10n('typetag_saved'));
-  }
-}
-
-// +-----------------------------------------------------------------------+
-// |                           delete typetags                             |
-// +-----------------------------------------------------------------------+
-
-if (isset($_GET['deletetypetag']))
-{
-  $query = '
 SELECT id
-  FROM '.typetags_TABLE.'
-  WHERE id = '.$_GET['deletetypetag'].'
-;';
-  
-  if ( pwg_db_num_rows(pwg_query($query)) )
-  {
-    $query = '
-UPDATE '.TAGS_TABLE.'
-  SET id_typetags = NULL
-  WHERE id_typetags = '.$_GET['deletetypetag'].'
-;';
-    pwg_query($query);
-    
-    $query = '
-DELETE FROM '.typetags_TABLE.'
-  WHERE id = '.$_GET['deletetypetag'].'
-;';
-    pwg_query($query);
-    
-    array_push($page['infos'], l10n('typetag_suppr'));
-  }
-  else
-  {
-    array_push($page['errors'], l10n('typetag_unknown'));
-  }
-}
-
-// +-----------------------------------------------------------------------+
-// |                               add a typetag                           |
-// +-----------------------------------------------------------------------+
-
-if ( isset($_POST['addtypetag']) and (empty($_POST['typetag_name']) or empty($_POST['typetag_color'])) )
-{
-  $template->assign('typetag', array(
-    'NAME' => $_POST['typetag_name'],
-    'COLOR' => $_POST['typetag_color'],
-  ));
-  
-  array_push($page['errors'], l10n('typetag_error'));
-}
-else if (isset($_POST['addtypetag']))
-{
-  $typetag_name = $_POST['typetag_name'];
-  $typetag_color = $_POST['typetag_color'];
-
-  // does the tag already exists?
-  $query = '
-SELECT id
-  FROM '.typetags_TABLE.'
-  WHERE name = "'.$_POST['typetag_name'].'"
+  FROM ' . TYPETAGS_TABLE . '
+  WHERE name = "' . pwg_db_real_escape_string($_POST['typetag_name']) . '"
 ';
 
-  if ( pwg_db_num_rows(pwg_query($query)) )
-  {
-    $template->assign('typetag', array(
-      'NAME' => $_POST['typetag_name'],
-      'COLOR' => $_POST['typetag_color'],
-    ));
-    
-    array_push($page['errors'], l10n('typetag_already_exists'));
-  }
-  else
-  {
-    $query = '
-INSERT INTO '.typetags_TABLE.'(
+    if (pwg_db_num_rows(pwg_query($query)))
+    {
+      $page['errors'][] = l10n('This name is already used');
+    }
+    else if ( ($color = check_color($_POST['typetag_color'])) === false )
+    {
+      $page['errors'][] = l10n('Invalid color');
+    }
+    else
+    {
+      $query = '
+INSERT INTO ' . TYPETAGS_TABLE . '(
     name,
     color
   )
   VALUES(
-    "'.$_POST['typetag_name'].'",
-    "'.$_POST['typetag_color'].'"
+    "' . pwg_db_real_escape_string($_POST['typetag_name']) . '",
+    "' . $color . '"
   )
 ;';
-    pwg_query($query);
-
-    array_push($page['infos'], l10n('typetag_saved'));
-  }
-}
-
-// +-----------------------------------------------------------------------+
-// |                           Associate Tag to Typetage                   |
-// +-----------------------------------------------------------------------+
-
-if (isset($_POST['delete_all_assoc'])) 
-{
-  pwg_query('UPDATE '.TAGS_TABLE.' SET id_typetags = NULL;');
-  array_push($page['infos'], l10n('All associations have been removed'));
-} 
-else if (isset($_POST['associations'])) 
-{
-  // beautify the parameters array
-  $string = preg_replace('#[;]$#', null, $_POST['associations']);
-  $associations = array();
-  $a = explode(';', $string);
-  
-  foreach ($a as $s) 
-  {
-    $v = explode(':', $s);
-    $associations[ltrim($v[0],'t-')] = ltrim($v[1],'tt-');
-  }
-
-  // save associations
-  $updates = array();
-  foreach ($associations as $tag => $typetag) 
-  {
-    array_push($updates, array(
-      'id' => $tag,
-      'id_typetags' => $typetag,
+      pwg_query($query);
+
+      $page['infos'][] = l10n('Color added');
+    }
+  }
+
+  if (count($page['errors']))
+  {
+    $template->assign('typetag', array(
+      'NAME' => $_POST['typetag_name'],
+      'COLOR' => $_POST['typetag_color'],
       ));
   }
-  
-  mass_updates(
-    TAGS_TABLE, 
-    array('primary' => array('id'), 'update' => array('id_typetags')),
-    $updates
-    );
-  
-  array_push($page['infos'], l10n('typetags_associated'));
 }
 
@@ -208 +148 @@
     'show_all' => $_POST['show_all'] == 'true',
     );
-    
+
   conf_update_param('TypeTags', serialize($conf['TypeTags']));
+  $page['infos'][] = l10n('Information data registered in database');
 }
 
@@ -217 +158 @@
 // |                             template init                             |
 // +-----------------------------------------------------------------------+
-
-$template->set_filenames(array('plugin_admin_content' => dirname(__FILE__) . '/admin/typetags_admin.tpl'));
-
-// get all tags
-$query = '
-SELECT 
-    id as tagid,
-    name as tagname, 
-    id_typetags as typetagid
-  FROM '.TAGS_TABLE.'
-  ORDER BY name ASC
-;';
-$all_tags = pwg_query($query);
-
-while ($row = pwg_db_fetch_assoc($all_tags))
-{
-  if (!$row['typetagid']) $row['typetagid'] = 'NULL';
-  $row['tagname'] = strip_tags(trigger_event('render_tag_name', $row['tagname']));
-  $template->append('typetags_association', $row);
-}
+$template->assign('TYPETAGS_PATH', TYPETAGS_PATH);
+$template->assign('F_ACTION', TYPETAGS_ADMIN);
 
 // get all typetags
-$query = 'SELECT * FROM '.typetags_TABLE.' ORDER BY name;';
-$all_typetags = pwg_query($query);
-
-while ($row = pwg_db_fetch_assoc($all_typetags))
+$query = 'SELECT * FROM ' . TYPETAGS_TABLE . ' ORDER BY name;';
+$result = pwg_query($query);
+
+while ($row = pwg_db_fetch_assoc($result))
 {
   $row['color_text'] = get_color_text($row['color']);
-  $row['u_edit'] = typetags_ADMIN . '&edittypetag=' . $row['id'];
-  $row['u_delete'] = typetags_ADMIN . '&deletetypetag=' . $row['id'];
-  
-  $template->append('typetags_selection', $row);
+  $row['u_edit'] = TYPETAGS_ADMIN . '&amp;edittypetag=' . $row['id'];
+  $row['u_delete'] = TYPETAGS_ADMIN . '&amp;deletetypetag=' . $row['id'];
+
+  $template->append('typetags', $row);
 }
 
@@ -254 +177 @@
 if (isset($_GET['edittypetag']))
 {
-  $edited_typetag['id'] = $_GET['edittypetag'];
-}
-
-if (isset($edited_typetag['id']))
+  $edited_typetag['id'] = intval($_GET['edittypetag']);
+}
+
+if (isset($edited_typetag['id']) and $edited_typetag['id']>0)
 {
   $template->assign('edited_typetag', $edited_typetag['id']);
-  
+
 $query = '
-SELECT 
-    id,
-    name,
-    color
-  FROM '.typetags_TABLE.'
-  WHERE id = '.$edited_typetag['id'].'
+SELECT *
+  FROM ' . TYPETAGS_TABLE . '
+  WHERE id = ' . $edited_typetag['id'] . '
 ;';
   $row = pwg_db_fetch_assoc(pwg_query($query));
@@ -278 +198 @@
     'NAME' => isset($edited_typetag['name']) ? $edited_typetag['name'] : $row['name'],
     'COLOR'=> isset($edited_typetag['color']) ? $edited_typetag['color'] : $row['color'],
-  ));
-  
+    ));
+
   $template->assign('IN_EDIT', true);
 }
@@ -286 +206 @@
 // |                           sending html code                           |
 // +-----------------------------------------------------------------------+
-
-$template->assign('typetags_ADMIN', typetags_ADMIN);
-$template->assign_var_from_handle('ADMIN_CONTENT', 'plugin_admin_content');
-
-?>
+$template->set_filename('typetags', realpath(TYPETAGS_PATH . 'template/admin.tpl'));
+$template->assign_var_from_handle('ADMIN_CONTENT', 'typetags');

extensions/typetags/include/events_public.inc.php

@@ -1 +1 @@
 <?php
+defined('TYPETAGS_PATH') or die('Hacking attempt!');
 
 /**
  * triggered by 'render_tag_name'
  */
-function typetags_render($tag)
+function typetags_render($tag_name, $tag=array())
 {
-  global $pwg_loaded_plugins, $page;
-  
-  if ( defined('IN_ADMIN') and in_array($page['page'], array('photo', 'batch_manager')) )
+  global $pwg_loaded_plugins, $page, $typetags_cache;
+
+  if (defined('IN_ADMIN') and in_array($page['page'], array('photo', 'batch_manager', 'tags')))
   {
-    return $tag;
+    return $tag_name;
   }
-  
-  $query = '
+
+  if (isset($typetags_cache['tags'][$tag_name]))
+  {
+    return $typetags_cache['tags'][$tag_name];
+  }
+
+  if (!isset($typetags_cache['colors']))
+  {
+    $query = '
+SELECT id, color
+  FROM ' . TYPETAGS_TABLE . '
+;';
+    $typetags_cache['colors'] = query2array($query, 'id', 'color');
+  }
+
+  if (!empty($tag['id_typetags']))
+  {
+    $color = $typetags_cache['colors'][ $tag['id_typetags'] ];
+  }
+  else
+  {
+    if (isset($tag['id']))
+    {
+      $where = 't.id = ' . $tag['id'];
+    }
+    else
+    {
+      $where = 't.name = "' . pwg_db_real_escape_string($tag_name) . '"';
+    }
+
+    $query = '
 SELECT color
-  FROM '.typetags_TABLE.' AS tt
-    INNER JOIN '.TAGS_TABLE.' AS t
-      ON t.id_typetags = tt.id
-  WHERE t.name = "'.pwg_db_real_escape_string($tag).'"
-;';;
-  list($color) = pwg_db_fetch_row(pwg_query($query));
-  
-  if ($color === null) 
+  FROM ' . TYPETAGS_TABLE . ' AS tt
+    INNER JOIN ' . TAGS_TABLE . ' AS t
+    ON t.id_typetags = tt.id
+  WHERE ' . $where . '
+;';
+    list($color) = pwg_db_fetch_row(pwg_query($query));
+  }
+
+  if ($color === null)
   {
-    return $tag;
+    $ret = $tag_name;
   }
   elseif (isset($pwg_loaded_plugins['ExtendedDescription']))
   {
-    return "[lang=all]<span style='color:".$color.";'>[/lang]".$tag."[lang=all]</span>[/lang]";
+    $ret = '[lang=all]<span style="color:' . $color . ';">[/lang]' . $tag_name . '[lang=all]</span>[/lang]';
   }
   else
   {
-    return "<span style='color:".$color.";'>".$tag."</span>";
+    $ret = '<span style="color:' . $color . ';">' . $tag_name . '</span>';
   }
+
+  $typetags_cache['tags'][$tag_name] = $ret;
+  return $ret;
 }
 
@@ -42 +76 @@
 {
   global $template;
-    
+
   $tags = $template->get_template_vars('related_tags');
   if (empty($tags)) return;
-  
+
   $query = '
 SELECT
     t.id ,
     tt.color
-  FROM '.typetags_TABLE.' AS tt
+  FROM '.TYPETAGS_TABLE.' AS tt
     INNER JOIN '.TAGS_TABLE.' AS t
       ON t.id_typetags = tt.id
@@ -65 +99 @@
     }
   }
-  
+
   $template->clear_assign('related_tags');
   $template->assign('related_tags', $tags);
@@ -75 +109 @@
 function typetags_tags()
 {
-  global $template;
+  global $template, $page, $tags;
+
+  if (empty($tags))
+  {
+    return;
+  }
 
   $query = '
 SELECT
-    t.id ,
+    t.id,
     tt.color
-  FROM '.typetags_TABLE.' AS tt
-    INNER JOIN '.TAGS_TABLE.' AS t
-      ON t.id_typetags = tt.id
+  FROM ' . TYPETAGS_TABLE . ' AS tt
+    INNER JOIN ' . TAGS_TABLE . ' AS t
+    ON t.id_typetags = tt.id
   WHERE t.id_typetags IS NOT NULL
 ;';
-  $tagsColor = simple_hash_from_query($query, 'id', 'color');
-  if (empty($tagsColor)) return;
+  $tagsColor = query2array($query, 'id', 'color');
 
-  $display = $template->get_template_vars('display_mode');
-  if ($display == 'letters')
+  if (empty($tagsColor))
+  {
+    return;
+  }
+
+  // LETTERS
+  if ($page['display_mode'] == 'letters')
   {
     $letters = $template->get_template_vars('letters');
-    if (empty($letters)) return;
 
-    foreach ($letters as $k1 => $letter)
+    foreach ($letters as &$letter)
     {
-      foreach ($letter['tags'] as $k2 => $tag)
+      foreach ($letter['tags'] as &$tag)
       {
         if (isset($tagsColor[ $tag['id'] ]))
         {
-          $letters[$k1]['tags'][$k2]['URL'].= '" style="color:'.$tagsColor[ $tag['id'] ].';';
+          $tag['URL'].= '" style="color:' . $tagsColor[ $tag['id'] ] . ';';
         }
       }
+      unset($tag);
     }
-    
-    $template->clear_assign('letters');
+    unset($letter);
+
     $template->assign('letters', $letters);
   }
-  elseif ($display == 'cloud')
+  // CLOUD
+  else if ($page['display_mode'] == 'cloud')
   {
     $tags = $template->get_template_vars('tags');
-    if (empty($tags)) return;
 
-    foreach ($tags as $key => $tag)
+    foreach ($tags as &$tag)
     {
       if (isset($tagsColor[ $tag['id'] ]))
       {
-        $tags[$key]['URL'].= '" style="color:'.$tagsColor[ $tag['id'] ].';';
+        $tag['URL'].= '" style="color:' . $tagsColor[ $tag['id'] ] . ';';
       }
     }
-    
-    $template->clear_assign('tags');
+    unset($tag);
+
     $template->assign('tags', $tags);
   }
-  elseif ($display == 'cumulus')
+  // CUMULUS
+  else if ($page['display_mode'] == 'cumulus')
   {
     $tags = $template->get_template_vars('tags');
-    if (empty($tags)) return;
 
-    foreach ($tags as $key => $tag)
+    foreach ($tags as &$tag)
     {
       if (isset($tagsColor[ $tag['id'] ]))
       {
         $tagsColor[ $tag['id'] ] = str_replace('#', '0x', $tagsColor[ $tag['id'] ]);
-        $tags[$key]['URL'].= '\' color=\''.$tagsColor[ $tag['id'] ].'\' hicolor=\''.$tagsColor[ $tag['id'] ];
+        $tag['URL'].= '\' color=\'' . $tagsColor[ $tag['id'] ] . '\' hicolor=\'' . $tagsColor[ $tag['id'] ];
       }
     }
-    
-    $template->clear_assign('tags');
+    unset($tag);
+
     $template->assign('tags', $tags);
   }
 }
-
-?>

extensions/typetags/language/ca_ES/plugin.lang.php

@@ -37 +37 @@
 $lang['Only on tags page'] = 'Només a la pàgina etiquetes';
 $lang['typetag_already_exists'] = 'Aquest TypeTag ja existeix';
-$lang['typetag_error'] = 'Cal omplir tots els camps (nom i color)';
+$lang['You must fill all fields (name and color)'] = 'Cal omplir tots els camps (nom i color)';
 $lang['typetag_saved'] = 'TypeTag desat';
 $lang['typetag_suppr'] = 'TypeTag eliminat';

extensions/typetags/language/cs_CZ/plugin.lang.php

@@ -26 +26 @@
 $lang['New color'] = 'Nová barva';
 $lang['New name'] = 'Nový název';
-$lang['typetag_error'] = 'Musíte vyplnit všechna pole (název a barva)';
+$lang['You must fill all fields (name and color)'] = 'Musíte vyplnit všechna pole (název a barva)';
 $lang['Color TypeTag'] = 'Barva TypeTagu';
 $lang['Create a Typetag'] = 'Vytvořit TypeTag';

extensions/typetags/language/da_DK/plugin.lang.php

@@ -38 +38 @@
 $lang['Only on tags page'] = 'Kun på tagside';
 $lang['typetag_already_exists'] = 'Dette TypeTag findes allerede';
-$lang['typetag_error'] = 'Du skal udfylde alle felter (navn og farve)';
+$lang['You must fill all fields (name and color)'] = 'Du skal udfylde alle felter (navn og farve)';
 $lang['typetag_saved'] = 'TypeTag gemt';
 $lang['typetag_suppr'] = 'TypeTag slettet';

extensions/typetags/language/de_DE/plugin.lang.php

@@ -21 +21 @@
 $lang['typetag_suppr'] = 'TypeTag gelöscht';
 $lang['typetag_unknown'] = 'Unknown TypeTag';
-$lang['typetag_error'] = 'Alle Felder müssen ausgefüllt werden (Name und Farbe)';
+$lang['You must fill all fields (name and color)'] = 'Alle Felder müssen ausgefüllt werden (Name und Farbe)';
 $lang['All associations have been removed'] = 'All associations have been removed';
 $lang['typetags_associated'] = 'TypeTags wurde assoziiert';

extensions/typetags/language/el_GR/plugin.lang.php

@@ -37 +37 @@
 $lang['Only on tags page'] = 'Μόνο στη σελίδα ετικετών';
 $lang['typetag_already_exists'] = 'Αυτό το TypeTag υπάρχει ήδη ';
-$lang['typetag_error'] = 'Θα πρέπει να συμπληρώσετε όλα τα πεδία (όνομα και το χρώμα)';
+$lang['You must fill all fields (name and color)'] = 'Θα πρέπει να συμπληρώσετε όλα τα πεδία (όνομα και το χρώμα)';
 $lang['typetag_saved'] = 'TypeTag αποθηκεύτηκε ';
 $lang['typetag_suppr'] = 'TypeTag διεγράφη';

extensions/typetags/language/en_UK/plugin.lang.php

@@ -1 +1 @@
 <?php
 
-/* section */
-$lang['Create a Typetag'] = 'Create a TypeTag';
-$lang['Edit typetag'] = 'Edit TypeTag';
-$lang['Edit and associate TypeTags'] = 'Edit and associate TypeTags';
-
-/* fields */
-$lang['Edited TypeTag'] = 'TypeTag edited';
-$lang['New color'] = 'New color';
-$lang['New TypeTag'] = 'TypeTag name';
-$lang['New name'] = 'New name';
-$lang['Color TypeTag'] = 'TypeTag color';
-$lang['Not associated'] = 'Not associated';
+$lang['Add a new color'] = 'Add a new color';
+$lang['Apply the same color to all tags'] = 'Apply the same color to all tags';
+$lang['Color'] = 'Color';
+$lang['Color added'] = 'Color added';
+$lang['Color deleted'] = 'Color deleted';
+$lang['Color saved'] = 'Color saved';
+$lang['Edit color'] = 'Edit color';
+$lang['Go to <a href="%s">Photos/Tags</a> to manage associations.'] = 'Go to <a href="%s">Photos/Tags</a> to manage associations.';
+$lang['Invalid color'] = 'Invalid color';
+$lang['Manage colors'] = 'Manage colors';
+$lang['This name is already used'] = 'This name is already used';
+$lang['Set a different color for each tag'] = 'Set a different color for each tag';
+$lang['Set tags color'] = 'Set tags color';
 $lang['Display colored tags'] = 'Display colored tags';
 $lang['Only on tags page'] = 'Only on tags page';
 $lang['Everywhere'] = 'Everywhere';
-
-/* buttons */
-$lang['Modify'] = 'Modify';
-$lang['Delete all associations'] = 'Delete all associations';
-
-/* messages */
-$lang['typetag_already_exists'] = 'This TypeTag already exists';
-$lang['typetag_saved'] = 'TypeTag saved';
-$lang['typetag_suppr'] = 'TypeTag deleted';
-$lang['typetag_unknown'] = 'Unknown TypeTag';
-$lang['typetag_error'] = 'You must fill all fields (name and color)';
-$lang['All associations have been removed'] = 'All associations have been removed';
-$lang['typetags_associated'] = 'TypeTags associated';
+$lang['New color'] = 'New color';
+$lang['You must fill all fields (name and color)'] = 'You must fill all fields (name and color)';
 
 ?>

extensions/typetags/language/es_ES/plugin.lang.php

@@ -21 +21 @@
 $lang['typetag_suppr'] = 'TypeTag suprimido';
 $lang['typetag_unknown'] = 'Unknown TypeTag';
-$lang['typetag_error'] = 'Usted debe informar todos los campos (nombre y color)';
+$lang['You must fill all fields (name and color)'] = 'Usted debe informar todos los campos (nombre y color)';
 $lang['All associations have been removed'] = 'All associations have been removed';
 $lang['typetags_associated'] = 'TypeTags asociado';

extensions/typetags/language/fr_FR/plugin.lang.php

@@ -1 +1 @@
 <?php
 
-/* section */
-$lang['Create a Typetag'] = 'Créer un TypeTag';
-$lang['Edit typetag'] = 'Editer le TypeTag';
-$lang['Edit and associate TypeTags'] = 'Editer et associer les TypeTags';
-
-/* fields */
-$lang['Edited TypeTag'] = 'TypeTag édité';
+$lang['Add a new color'] = 'Ajouter une nouvelle couleur';
+$lang['Apply the same color to all tags'] = 'Appliquer la même couleur à tous les tags';
+$lang['Color'] = 'Couleur';
+$lang['Color added'] = 'Couleur ajoutée';
+$lang['Color deleted'] = 'Couleur supprimée';
+$lang['Color saved'] = 'Couleur sauvegardée';
+$lang['Edit color'] = 'Editer une couleur';
+$lang['Go to <a href="%s">Photos/Tags</a> to manage associations.'] = 'Allez sur <a href="%s">Photos/Tags</a> pour gérer les associations.';
+$lang['Invalid color'] = 'Couleur invalide';
+$lang['Manage colors'] = 'Gérer les couleurs';
+$lang['This name is already used'] = 'The nom est déjà utilisé';
+$lang['Set a different color for each tag'] = 'Appliquer une couleur différente à chaque tag';
+$lang['Set tags color'] = 'Changer la couleur des tags';
+$lang['Display colored tags'] = 'Afficher les tags colorés';
+$lang['Only on tags page'] = 'Uniquement sur la liste des tags';
+$lang['Everywhere'] = 'Partout';
 $lang['New color'] = 'Nouvelle couleur';
-$lang['New TypeTag'] = 'Nom du TypeTag';
-$lang['New name'] = 'Nouveau nom';
-$lang['Color TypeTag'] = 'Couleur du TypeTag';
-$lang['Not associated'] = 'Non associés';
-$lang['Display colored tags'] = 'Afficher les tags colorés';
-$lang['Only on tags page'] = 'Seulement sur la page des tags';
-$lang['Everywhere'] = 'Partout';
-
-/* buttons */
-$lang['Modify'] = 'Modifier';
-$lang['Delete all associations'] = 'Supprimer toutes les associations';
-
-/* messages */
-$lang['typetag_already_exists'] = 'Ce TypeTag existe déjà';
-$lang['typetag_saved'] = 'TypeTag enregistré';
-$lang['typetag_suppr'] = 'TypeTag supprimé';
-$lang['typetag_unknown'] = 'TypeTag inconnu';
-$lang['typetag_error'] = 'Vous devez renseigner tous les champs (nom et couleur)';
-$lang['All associations have been removed'] = 'Tous les associations ont été supprimées';
-$lang['typetags_associated'] = 'TypeTags associés';
+$lang['You must fill all fields (name and color)'] = 'Vous devez remplir tous les champs (nom et couleur)';
 
 ?>

extensions/typetags/language/gl_ES/plugin.lang.php

@@ -32 +32 @@
 $lang['typetag_unknown'] = 'EtiquetaTipo descoñecida';
 $lang['typetags_associated'] = 'EtiquetasTipo asociadas';
-$lang['typetag_error'] = 'Debes encher tódolos campos (nome e cor)';
+$lang['You must fill all fields (name and color)'] = 'Debes encher tódolos campos (nome e cor)';
 $lang['Delete all associations'] = 'Eliminar todas as asociacións';
 $lang['Display colored tags'] = 'Amosar as etiquetas coloreadas';

extensions/typetags/language/hu_HU/plugin.lang.php

@@ -37 +37 @@
 $lang['Only on tags page'] = 'Csak a címkék oldalon';
 $lang['typetag_already_exists'] = 'Ilyes címke típus már létezik';
-$lang['typetag_error'] = 'Ki kel tölteni a mezőket (név és szín)';
+$lang['You must fill all fields (name and color)'] = 'Ki kel tölteni a mezőket (név és szín)';
 $lang['typetag_saved'] = 'Címke típus mentve';
 $lang['typetag_suppr'] = 'Címke típus törölve';

extensions/typetags/language/it_IT/plugin.lang.php

@@ -21 +21 @@
 $lang['typetag_suppr'] = 'TypeTag cancellato';
 $lang['typetag_unknown'] = 'TypeTag sconosciuto';
-$lang['typetag_error'] = 'Dovete inserire tutti campi (nome e colore)';
+$lang['You must fill all fields (name and color)'] = 'Dovete inserire tutti campi (nome e colore)';
 $lang['All associations have been removed'] = 'Tutte le associazioni sono state rimosse';
 $lang['typetags_associated'] = 'TypeTag associato';

extensions/typetags/language/lv_LV/plugin.lang.php

@@ -21 +21 @@
 $lang['typetag_suppr'] = 'TypeTag dzēsti';
 $lang['typetag_unknown'] = 'Unknown TypeTag';
-$lang['typetag_error'] = 'Jums jāinformē visus laukus (nosaukums un krāsa)';
+$lang['You must fill all fields (name and color)'] = 'Jums jāinformē visus laukus (nosaukums un krāsa)';
 $lang['All associations have been removed'] = 'All associations have been removed';
 $lang['typetags_associated'] = 'TypeTags sasaistīts';

extensions/typetags/language/nb_NO/plugin.lang.php

@@ -21 +21 @@
 $lang['typetag_suppr'] = 'TypeTag slettet';
 $lang['typetag_unknown'] = 'Unknown TypeTag';
-$lang['typetag_error'] = 'Du må inkludere alle felter (navn og farge)';
+$lang['You must fill all fields (name and color)'] = 'Du må inkludere alle felter (navn og farge)';
 $lang['All associations have been removed'] = 'All associations have been removed';
 $lang['typetags_associated'] = 'TypeTags assossiert';

extensions/typetags/language/nl_NL/plugin.lang.php

@@ -32 +32 @@
 $lang['New name'] = 'Nieuwe naam';
 $lang['typetag_already_exists'] = 'Deze TypeTag bestaat al';
-$lang['typetag_error'] = 'Je moet alle velden invullen (naam en kleur)';
+$lang['You must fill all fields (name and color)'] = 'Je moet alle velden invullen (naam en kleur)';
 $lang['typetag_saved'] = 'TypeTag opgeslagen';
 $lang['typetag_suppr'] = 'TypeTag verwijderd';

extensions/typetags/language/pl_PL/plugin.lang.php

@@ -33 +33 @@
 $lang['typetags_associated'] = 'Powiązano TypeTag';
 $lang['typetag_already_exists'] = 'Ten TypeTag już istnieje';
-$lang['typetag_error'] = 'Należy uzupełnić wszystkie pola (nazwę i kolor)';
+$lang['You must fill all fields (name and color)'] = 'Należy uzupełnić wszystkie pola (nazwę i kolor)';
 $lang['typetag_saved'] = 'Zapisano TypeTag';
 $lang['typetag_suppr'] = 'Skasowano TypeTag';

extensions/typetags/language/pt_BR/plugin.lang.php

@@ -38 +38 @@
 $lang['Only on tags page'] = 'Somente na página etiquetas';
 $lang['typetag_already_exists'] = 'Este TipoEtiqueta já existe';
-$lang['typetag_error'] = 'Você deve preencher todos os campos (nome e cor)';
+$lang['You must fill all fields (name and color)'] = 'Você deve preencher todos os campos (nome e cor)';
 $lang['typetag_saved'] = 'TipoEtiqueta salvo';
 $lang['typetag_suppr'] = 'TipoEtiqueta eliminado';

extensions/typetags/language/pt_PT/plugin.lang.php

@@ -37 +37 @@
 $lang['Only on tags page'] = 'Apenas na página de etiquetas';
 $lang['typetag_already_exists'] = 'Já existe o tipo de etiqueta';
-$lang['typetag_error'] = 'Deve preencher todos os campos ( nome e cor)';
+$lang['You must fill all fields (name and color)'] = 'Deve preencher todos os campos ( nome e cor)';
 $lang['typetag_saved'] = 'Tipo de etiqueta salvo';
 $lang['typetag_suppr'] = 'Apagado o tipo de etiqueta';

extensions/typetags/language/ru_RU/plugin.lang.php

@@ -32 +32 @@
 $lang['New name'] = 'Новое название';
 $lang['typetag_already_exists'] = 'Этот тип тегов уже есть';
-$lang['typetag_error'] = 'Нужно заполнить все поля (название и цвет)';
+$lang['You must fill all fields (name and color)'] = 'Нужно заполнить все поля (название и цвет)';
 $lang['typetag_saved'] = 'Тип тегов сохранен';
 $lang['typetag_suppr'] = 'Тип тегов удален';

extensions/typetags/language/sk_SK/plugin.lang.php

@@ -19 +19 @@
 $lang['typetag_already_exists'] = 'Tento typ kľúčového slova už existuje';
 $lang['typetag_unknown'] = 'Unknown TypeTag';
-$lang['typetag_error'] = 'Môžete meniť všetky údaje (názov a farbu)';
+$lang['You must fill all fields (name and color)'] = 'Môžete meniť všetky údaje (názov a farbu)';
 $lang['All associations have been removed'] = 'All associations have been removed';
 $lang['typetags_associated'] = 'Kľúčové slovo spojené';

extensions/typetags/language/tr_TR/plugin.lang.php

@@ -37 +37 @@
 $lang['Only on tags page'] = 'Sadece bir etiket sayfası';
 $lang['typetag_already_exists'] = 'Bu TypeTag zaten var';
-$lang['typetag_error'] = 'Tüm alanları doldurmalısınız (isim ve renk)';
+$lang['You must fill all fields (name and color)'] = 'Tüm alanları doldurmalısınız (isim ve renk)';
 $lang['typetag_saved'] = 'TypeTag kaydedildi';
 $lang['typetag_suppr'] = 'TypeTag silindi';

extensions/typetags/language/uk_UA/plugin.lang.php

@@ -33 +33 @@
 $lang['typetags_associated'] = 'TypeTags, пов\'язані';
 $lang['typetag_already_exists'] = 'Це TypeTag вже існує';
-$lang['typetag_error'] = 'Ви повинні заповнити всі поля (ім\'я та колір)';
+$lang['You must fill all fields (name and color)'] = 'Ви повинні заповнити всі поля (ім\'я та колір)';
 $lang['typetag_saved'] = 'TypeTag збережено';
 $lang['typetag_suppr'] = 'TypeTag видалено';

extensions/typetags/language/zh_CN/plugin.lang.php

@@ -23 +23 @@
 $lang['Edit and associate TypeTags'] = '编辑和关联TypeTag（标签组）';
 $lang['Not associated'] = '尚未关联到标签组的标签';
-$lang['typetag_error'] = '请完整填写信息（名称与颜色）';
+$lang['You must fill all fields (name and color)'] = '请完整填写信息（名称与颜色）';
 $lang['typetags_associated'] = 'TypeTag（标签组）已关联';
 $lang['All associations have been removed'] = '所有关联已删除';

extensions/typetags/language/zh_TW/plugin.lang.php

@@ -28 +28 @@
 $lang['Only on tags page'] = '僅在標籤頁';
 $lang['typetag_already_exists'] = '此TypeTag（標籤組）已存在';
-$lang['typetag_error'] = '請完整填寫信息（名稱與顏色）';
+$lang['You must fill all fields (name and color)'] = '請完整填寫信息（名稱與顏色）';
 $lang['typetag_saved'] = 'TypeTag（標籤組）已保存';
 $lang['typetag_suppr'] = 'TypeTag（標籤組）已刪除';

extensions/typetags/main.inc.php

@@ -1 +1 @@
 <?php
 /*
-Plugin Name: TypeT@gs
+Plugin Name: Coloured Tags (TypeT@gs)
 Version: auto
 Description: Allow to manage color of tags, as you want...
-Plugin URI: http://piwigo.org/ext/extension_view.php?eid=166
-Author: Sakkhho & P@t & Mistic
+Plugin URI: auto
+Author: Mistic
 */
 
-if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
+defined('PHPWG_ROOT_PATH') or die('Hacking attempt!');
 
 global $prefixeTable, $conf;
 
-define('typetags_PATH' , PHPWG_PLUGINS_PATH . basename(dirname(__FILE__)) . '/');
-define('typetags_TABLE' , $prefixeTable . 'typetags');
-define('typetags_ADMIN', get_root_url().'admin.php?page=plugin-' . basename(dirname(__FILE__)));
+define('TYPETAGS_ID',      basename(dirname(__FILE__)));
+define('TYPETAGS_PATH' ,   PHPWG_PLUGINS_PATH . TYPETAGS_ID . '/');
+define('TYPETAGS_TABLE' ,  $prefixeTable . 'typetags');
+define('TYPETAGS_ADMIN',   get_root_url().'admin.php?page=plugin-' . TYPETAGS_ID);
+define('TYPETAGS_VERSION', 'auto');
 
 
-include_once(typetags_PATH . 'typetags.php');
 $conf['TypeTags'] = unserialize($conf['TypeTags']);
+
+
+include_once(TYPETAGS_PATH . 'include/events_public.inc.php');
 
 // tags on picture page
@@ -27 +31 @@
 
 // tags everywhere
-if ( $conf['TypeTags']['show_all'] and script_basename() != 'tags' )
+if ($conf['TypeTags']['show_all'] and script_basename() != 'tags')
 {
-  add_event_handler('render_tag_name', 'typetags_render', 0);
-}
-// tags on tags page
-else if (script_basename() == 'tags')
-{
-  add_event_handler('loc_begin_page_header', 'typetags_tags');
+  add_event_handler('render_tag_name', 'typetags_render', 0, 2);
 }
 
+// tags on tags page
+add_event_handler('loc_end_tags', 'typetags_tags');
 
-add_event_handler('get_admin_plugin_menu_links', 'typetags_admin_menu');
 
-function typetags_admin_menu($menu)
+if (defined('IN_ADMIN'))
 {
-  array_push($menu, array(
-    'NAME' => 'TypeT@gs',
-    'URL' => typetags_ADMIN,
-  ));
-  return $menu;
+  add_event_handler('get_admin_plugin_menu_links', 'typetags_admin_menu');
+
+  add_event_handler('loc_begin_admin_page', 'typetags_admin');
+
+  include_once(TYPETAGS_PATH . 'include/events_admin.inc.php');
 }
-
-?>

extensions/typetags/maintain.inc.php

@@ -1 +1 @@
 <?php
-if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
+defined('PHPWG_ROOT_PATH') or die('Hacking attempt!');
 
-function plugin_install()
+class typetags_maintain extends PluginMaintain
 {
-  global $prefixeTable;
+  private $installed = false;
 
-  $query = 'SHOW FULL COLUMNS FROM ' . TAGS_TABLE . ';';
-  $result = array_from_query($query, 'Field');
-  if (!in_array('id_typetags', $result))
+  private $default_conf = array(
+    'show_all'=>true,
+    );
+
+  function install($plugin_version, &$errors=array())
   {
-    pwg_query('ALTER TABLE '.TAGS_TABLE.' ADD COLUMN `id_typetags` SMALLINT(5);');
-  }
+    global $conf, $prefixeTable;
 
-  $result = pwg_query('SHOW TABLES LIKE "' . $prefixeTable .'typetags"');
-  if (!pwg_db_num_rows($result))
-  {
+    if (empty($conf['TypeTags']))
+    {
+      $conf['TypeTags'] = serialize($this->default_conf);
+      conf_update_param('TypeTags', $conf['TypeTags']);
+    }
+
+    $result = pwg_query('SHOW COLUMNS FROM `' . TAGS_TABLE . '` LIKE "id_typetags";');
+    if (!pwg_db_num_rows($result))
+    {
+      pwg_query('ALTER TABLE `' . TAGS_TABLE . '` ADD `id_typetags` SMALLINT(5) DEFAULT NULL;');
+    }
+
     $query = '
-CREATE TABLE `'. $prefixeTable .'typetags` (
+CREATE TABLE IF NOT EXISTS `' . $prefixeTable . 'typetags` (
   `id` smallint(5) unsigned NOT NULL AUTO_INCREMENT,
   `name` varchar(255) NOT NULL,
@@ -25 +35 @@
 ;';
     pwg_query($query);
+
+    $this->installed = true;
   }
-  
-  conf_update_param('TypeTags', serialize(array('show_all'=>true)));
-}
 
-function plugin_activate()
-{
-  global $conf;
-  
-  if (!isset($conf['TypeTags']))
+  function activate($plugin_version, &$errors=array())
   {
-    conf_update_param('TypeTags', serialize(array('show_all'=>true)));
+    if (!$this->installed)
+    {
+      $this->install($plugin_version, $errors);
+    }
+  }
+
+  function deactivate()
+  {
+  }
+
+  function uninstall()
+  {
+    global $prefixeTable;
+
+    conf_delete_param('TypeTags');
+
+    pwg_query('ALTER TABLE `' . TAGS_TABLE . '` DROP `id_typetags`');
+    pwg_query('DROP TABLE `' . $prefixeTable . 'typetags`;');
   }
 }
-
-function plugin_uninstall()
-{
-  global $prefixeTable;
-
-  pwg_query('ALTER TABLE '.TAGS_TABLE.' DROP COLUMN `id_typetags`');
-  pwg_query('DROP TABLE '. $prefixeTable .'typetags;');
-  pwg_query('DELETE FROM '.CONFIG_TABLE.' WHERE param = "TypeTags" LIMIT 1;');
-}
-
-?>

extensions/typetags/template/admin.tpl

@@ -1 @@
-{combine_script id="jquery.ui.draggable"}
-{combine_script id="jquery.ui.droppable"}
-{combine_script id="farbtastic" require="jquery" path=$ROOT_URL|@cat:"plugins/typetags/admin/farbtastic/farbtastic.js"}
-{combine_css path=$ROOT_URL|@cat:"plugins/typetags/admin/farbtastic/farbtastic.css"}
-{combine_css path=$ROOT_URL|@cat:"plugins/typetags/admin/typetags_style.css"}
+{combine_script id="farbtastic" require="jquery" path=$TYPETAGS_PATH|cat:"template/farbtastic/farbtastic.js"}
+{combine_css path=$TYPETAGS_PATH|cat:"template/farbtastic/farbtastic.css"}
+{combine_css path=$TYPETAGS_PATH|cat:"template/style.css"}
 
-{footer_script}{literal}
-// set all containers the same size
-function equilibrate() {
-  var h=0;
-  jQuery("#associations ul")
-    .css('height', 'auto')
-    .each(function() { 
-      h = Math.max(h, jQuery(this).height());
-    })
-    .promise().done(function() { 
-      jQuery("#associations ul").css({'height': h+'px'});
-    });
-    
-  //jQuery("#tt-NULL").css('height', 'auto');
-}
-
-// generate tag:typetag couples before submit the form
-function save_datas(form) {
-  var out = '';
-  
-  jQuery(".tt-container").each(function() {
-    var section = jQuery(this).attr('id');
-    jQuery("> li", this).each(function() { 
-      out += jQuery(this).attr('id') + ':' + section + ';';
-    });
-  });
-  
-  jQuery('#assoc-input').val(out);
-  submit(form);
-}
-
-// colorpicker
+{footer_script}
+// init colorpicker
 jQuery('#colorpicker').farbtastic('#hexval');
-
-// move each tag in it's typetag container
-jQuery('ul#tt-NULL li').each(function() {
-  var $target = jQuery('ul#' + jQuery(this).attr('data'));
-  jQuery(this).appendTo($target).css('float', 'left');
-  if ($($target).attr('id') == 'tt-NULL') jQuery(this).css({'display':'inline-block','float':'none'});
-});
-equilibrate();
-
-// init drag
-jQuery("li").draggable({
-  revert: "invalid",
-  helper: "clone",
-  cursor: "move"
-});
-
-// init drop
-jQuery('.tt-container').droppable({
-  accept: "li",
-  hoverClass: "active",
-  drop: function(event, ui) {
-    var $gallery = this;
-    ui.draggable.fadeOut(function() {
-      jQuery(this).appendTo($gallery).css('float', 'left').css('display','').fadeIn();
-      if ($($gallery).attr('id') == 'tt-NULL') jQuery(this).css({'display':'inline-block','float':'none'});
-      equilibrate();
-    });      
-  }
-});
-{/literal}{/footer_script}
+{/footer_script}
 
 <div class="titrePage">
-  <h2>TypeT@gs</h2>
+  <h2>Coloured Tags</h2>
 </div>
- 
-<form action="{$typetags_ADMIN}" method="post" name="form">
+
+<form action="{$F_ACTION}" method="post" name="form">
   <fieldset>
   {if isset($IN_EDIT)}
-    <legend>{'Edit typetag'|@translate}</legend>
+    <legend>{'Edit color'|translate}</legend>
     <div class="edit-container">
       <div id="colorpicker"></div>
-      <p><b>{'Edited TypeTag'|@translate} : <input type="text" readonly="readonly" size="18" style="background-color:{$typetag.OLD_COLOR};color:{$typetag.COLOR_TEXT};" value="{$typetag.OLD_NAME}"></b></p>
+      <p><b>{'Edit color'|translate} : <input type="text" readonly="readonly" size="18" style="background-color:{$typetag.OLD_COLOR};color:{$typetag.COLOR_TEXT};" value="{$typetag.OLD_NAME}"></b></p>
       <p>&nbsp;</p>
-      <p>{'New name'|@translate} : <input type="text" size="18" name="typetag_name" value="{$typetag.NAME}"></p>
-      <p>{'New color'|@translate} : <input type="text" id="hexval" name="typetag_color" size="7" maxlength="7" value="{$typetag.COLOR}"></p>
+      <p>{'New name'|translate} : <input type="text" size="18" name="typetag_name" value="{$typetag.NAME}"></p>
+      <p>{'New color'|translate} : <input type="text" id="hexval" name="typetag_color" size="7" maxlength="7" value="{$typetag.COLOR}"></p>
       <p>&nbsp;</p>
       <p>
         <input type="hidden" name="edited_typetag" value="{$edited_typetag}">
-        <input class="submit" type="submit" name="edittypetag" value="{'Modify'|@translate}">
-        <input class="submit" type="submit" name="cancel" value="{'Reset'|@translate}">
+        <input class="submit" type="submit" name="edittypetag" value="{'Save'|translate}">
+        <input class="submit" type="submit" name="cancel" value="{'Reset'|translate}">
       </p>
     </div>
   {else}
-    <legend>{'Create a Typetag'|@translate}</legend>
+    <legend>{'Add a new color'|translate}</legend>
     <div class="edit-container">
       <div id="colorpicker"></div>
-      <p>{'New TypeTag'|@translate} : <input type="text" size="18" name="typetag_name" value="{if isset($typetag.NAME)}{$typetag.NAME}{/if}"></p>
-      <p>{'Color TypeTag'|@translate} : <input type="text" id="hexval" name="typetag_color" size="7" maxlength="7" value="{if isset($typetag.COLOR)}{$typetag.COLOR}{else}#444444{/if}"></p>
+      <p>&nbsp;</p>
+      <p>{'Name'|translate} : <input type="text" size="18" name="typetag_name" value="{if isset($typetag.NAME)}{$typetag.NAME}{/if}"></p>
+      <p>{'Color'|translate} : <input type="text" id="hexval" name="typetag_color" size="7" maxlength="7" value="{if isset($typetag.COLOR)}{$typetag.COLOR}{else}#444444{/if}"></p>
       <p>&nbsp;</p>
       <p>
-        <input class="submit" type="submit" name="addtypetag" value="{'Create a Typetag'|@translate}">
+        <input class="submit" type="submit" name="addtypetag" value="{'Add'|translate}">
       </p>
     </div>
@@ -105 +45 @@
 </form>
 
-{if !empty($typetags_selection) and !isset($IN_EDIT)}
-<form action="{$typetags_ADMIN}" method="post" name="form" onsubmit="save_datas(this);">
+{if !empty($typetags)}
+<fieldset>
+  <legend>{'Manage colors'|translate}</legend>
+
+  <ul class="tagSelection typetagSelection">
+  {foreach from=$typetags item=typetag}
+    <li style="background-color:{$typetag.color};color:{$typetag.color_text};">
+      <span class="buttons">
+        <a href="{$typetag.u_edit}" title="{'edit'|translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/edit_s.png" class="button" alt="{'edit'|translate}"></a>
+        <a href="{$typetag.u_delete}" title="{'delete'|translate}" onclick="return confirm('{'Are you sure?'|translate}');"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/delete.png" class="button" alt="{'delete'|translate}"></a>
+      </span>
+      {$typetag.name}
+    </li>
+  {/foreach}
+  </ul>
+
+  <p style="text-align:left;">{'Go to <a href="%s">Photos/Tags</a> to manage associations.'|translate:($ROOT_URL|cat:'admin.php?page=tags')}</p>
+</fieldset>
+{/if}
+
+
+<form action="{$F_ACTION}" method="post" name="form">
   <fieldset>
-    <legend>{'Edit and associate TypeTags'|@translate}</legend>
-    
-    <ul id="tt-NULL" class="tt-container NULL">
-      <h5>{'Not associated'|@translate}</h5>
-      {foreach from=$typetags_association item=tag}
-      <li id="t-{$tag.tagid}" data="tt-{$tag.typetagid}">
-        {$tag.tagname}
-      </li>
-      {/foreach}
-    </ul>
-    
-    <div id="associations">
-    {foreach from=$typetags_selection item=typetag}
-      <ul id="tt-{$typetag.id}" class="tt-container" style="box-shadow:inset 0 0 5px {$typetag.color};">
-        <span class="buttons">
-          <a href="{$typetag.u_edit}" title="{'edit'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/edit_s.png" class="button" alt="{'edit'|@translate}"></a>
-          <a href="{$typetag.u_delete}" title="{'delete'|@translate}" onclick="return confirm('{'Are you sure?'|@translate}');"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/delete.png" class="button" alt="{'delete'|@translate}"></a>
-        </span>
-        <h5 style="background-color:{$typetag.color};color:{$typetag.color_text};">{$typetag.name}</h5>
-      </ul>
-    {/foreach}
-    </div>
-    
-    <div style="clear:both;"></div>
-    <p style="margin-top:20px;">
-      <input type="hidden" name="associations" id="assoc-input">
-      <input class="submit" type="submit" name="associate" value="{'Validate'|@translate}">
-      <input class="submit" type="submit" name="delete_all_assoc" value="{'Delete all associations'|@translate}" onclick="return confirm('{'Are you sure?'|@translate}');">
-    </p>
+    <legend>{'Configuration'|translate}</legend>
+
+    <b>{'Display colored tags'|translate}</b>
+    <label><input type="radio" name="show_all" value="false" {if not $SHOW_ALL}checked="checked"{/if}> {'Only on tags page'|translate}</label>
+    <label><input type="radio" name="show_all" value="true" {if $SHOW_ALL}checked="checked"{/if}> {'Everywhere'|translate}</label>
+
+    <p><input class="submit" type="submit" name="save_config" value="{'Submit'|translate}"></p>
   </fieldset>
 </form>
-{/if}
-
-{if !isset($IN_EDIT)}
-<form action="{$typetags_ADMIN}" method="post" name="form">
-<fieldset>
-  <legend>{'Configuration'|@translate}</legend>
-  <b>{'Display colored tags'|@translate}</b>
-  <label><input type="radio" name="show_all" value="false" {if not $SHOW_ALL}checked="checked"{/if}> {'Only on tags page'|@translate}</label>
-  <label><input type="radio" name="show_all" value="true" {if $SHOW_ALL}checked="checked"{/if}> {'Everywhere'|@translate}</label>
-  <p><input class="submit" type="submit" name="save_config" value="{'Submit'|@translate}"></p> 
-</fieldset>
-</form>
-{/if}