aboutsummaryrefslogtreecommitdiffstats
path: root/template/yoga
diff options
context:
space:
mode:
Diffstat (limited to 'template/yoga')
-rw-r--r--template/yoga/admin.tpl1
-rw-r--r--template/yoga/admin/element_set_global.tpl16
-rw-r--r--template/yoga/admin/element_set_unit.tpl4
-rw-r--r--template/yoga/admin/picture_modify.tpl5
-rw-r--r--template/yoga/admin/tags.tpl55
-rw-r--r--template/yoga/content.css1
-rw-r--r--template/yoga/default-layout.css9
-rw-r--r--template/yoga/icon/add_tag.pngbin0 -> 59 bytes
-rw-r--r--template/yoga/index.tpl17
-rw-r--r--template/yoga/menubar.css9
-rw-r--r--template/yoga/picture.tpl4
-rw-r--r--template/yoga/search.tpl10
-rw-r--r--template/yoga/search_rules.tpl12
-rw-r--r--template/yoga/tags.tpl17
14 files changed, 143 insertions, 17 deletions
diff --git a/template/yoga/admin.tpl b/template/yoga/admin.tpl
index 785e312d9..6f0a58789 100644
--- a/template/yoga/admin.tpl
+++ b/template/yoga/admin.tpl
@@ -54,6 +54,7 @@
<li><a href="{U_COMMENTS}">{lang:comments}</a></li>
<li><a href="{U_RATING}">{lang:Rating}</a></li>
<li><a href="{U_CADDIE}">{lang:Caddie}</a></li>
+ <li><a href="{U_TAGS}">{lang:Tags}</a></li>
</ul>
</dd>
diff --git a/template/yoga/admin/element_set_global.tpl b/template/yoga/admin/element_set_global.tpl
index 53c956d40..a4e46508c 100644
--- a/template/yoga/admin/element_set_global.tpl
+++ b/template/yoga/admin/element_set_global.tpl
@@ -83,21 +83,15 @@
</tr>
<tr>
- <td>{lang:add keywords}</td>
- <td><input type="text" name="add_keywords" value="" /></td>
+ <td>{lang:add tags}</td>
+ <td>{ADD_TAG_SELECTION}</td>
</tr>
<tr>
- <td>{lang:remove keyword}</td>
- <td>
- <select name="remove_keyword">
- <!-- BEGIN remove_keyword_option -->
- <option value="{remove_keyword_option.VALUE}">{remove_keyword_option.OPTION}</option>
- <!-- END remove_keyword_option -->
- </select>
- </td>
+ <td>{lang:remove tags}</td>
+ <td>{DEL_TAG_SELECTION}</td>
</tr>
-
+
<tr>
<td>{lang:author}</td>
<td>
diff --git a/template/yoga/admin/element_set_unit.tpl b/template/yoga/admin/element_set_unit.tpl
index a5e718012..63b7fa5b6 100644
--- a/template/yoga/admin/element_set_unit.tpl
+++ b/template/yoga/admin/element_set_unit.tpl
@@ -69,8 +69,8 @@
</tr>
<tr>
- <td><strong>{lang:Keywords}</strong></td>
- <td><input type="text" name="keywords-{element.ID}" value="{element.KEYWORDS}" size="50" /></td>
+ <td><strong>{lang:Tags}</strong></td>
+ <td>{element.TAG_SELECTION}</td>
</tr>
<tr>
diff --git a/template/yoga/admin/picture_modify.tpl b/template/yoga/admin/picture_modify.tpl
index 2be4547dd..c10e7744e 100644
--- a/template/yoga/admin/picture_modify.tpl
+++ b/template/yoga/admin/picture_modify.tpl
@@ -99,10 +99,11 @@
</tr>
<tr>
- <td><strong>{lang:Keywords}</strong></td>
- <td><input type="text" name="keywords" value="{KEYWORDS}" size="50" /></td>
+ <td><strong>{lang:Tags}</strong></td>
+ <td>{TAG_SELECTION}</td>
</tr>
+
<tr>
<td><strong>{lang:Description}</strong></td>
<td><textarea name="description" class="description">{DESCRIPTION}</textarea></td>
diff --git a/template/yoga/admin/tags.tpl b/template/yoga/admin/tags.tpl
new file mode 100644
index 000000000..c39181580
--- /dev/null
+++ b/template/yoga/admin/tags.tpl
@@ -0,0 +1,55 @@
+<div class="titrePage">
+ <h2>{lang:Manage tags}</h2>
+</div>
+
+<form action="{F_ACTION}" method="post">
+
+ <!-- BEGIN edit_tags -->
+ <input type="hidden" name="edit_list" value="{edit_tags.LIST}" />
+
+ <fieldset>
+ <legend>{lang:Edit tags}</legend>
+
+ <table class="table2">
+ <tr class="throw">
+ <th>{lang:Current name}</th>
+ <th>{lang:New name}</th>
+ </tr>
+ <!-- BEGIN tag -->
+ <tr>
+ <td>{edit_tags.tag.NAME}</td>
+ <td><input type="text" name="tag_name-{edit_tags.tag.ID}" value="{edit_tags.tag.NAME}" /></td>
+ </tr>
+ <!-- END tag -->
+ </table>
+
+ <p>
+ <input type="submit" name="submit" value="{lang:Submit}" {TAG_INPUT_ENABLED} />
+ <input type="reset" value="{lang:Reset}" />
+ </p>
+ </fieldset>
+ <!-- END edit_tags -->
+
+ <fieldset>
+ <legend>{lang:Add a tag}</legend>
+
+ <label>
+ {lang:New tag}
+ <input type="text" name="add_tag" />
+ </label>
+
+ <p><input type="submit" name="add" value="{lang:Submit}" {TAG_INPUT_ENABLED}/></p>
+ </fieldset>
+
+ <fieldset>
+ <legend>{lang:Tag selection}</legend>
+
+ {TAG_SELECTION}
+
+ <p>
+ <input type="submit" name="edit" value="{lang:Edit selected tags}" {TAG_INPUT_ENABLED}/>
+ <input type="submit" name="delete" value="{lang:Delete selected tags}" {TAG_INPUT_ENABLED}/>
+ </p>
+ </fieldset>
+
+</form>
diff --git a/template/yoga/content.css b/template/yoga/content.css
index 2054efd78..56599ec93 100644
--- a/template/yoga/content.css
+++ b/template/yoga/content.css
@@ -13,6 +13,7 @@ BODY#theAboutPage #content,
BODY#thePopuphelpPage #content,
BODY#thePasswordPage #content,
BODY#theNotificationPage #content,
+BODY#theTagsPage #content,
BODY#theNBMPage #content
{
margin: 1em;
diff --git a/template/yoga/default-layout.css b/template/yoga/default-layout.css
index d8aab0732..a5637c17e 100644
--- a/template/yoga/default-layout.css
+++ b/template/yoga/default-layout.css
@@ -261,3 +261,12 @@ UL.actions A {
border: none;
}
+UL.tagSelection {
+ width: 500px;
+ padding: 0;
+}
+
+UL.tagSelection LI {
+ display: inline;
+ white-space: nowrap;
+} \ No newline at end of file
diff --git a/template/yoga/icon/add_tag.png b/template/yoga/icon/add_tag.png
new file mode 100644
index 000000000..5c5e235de
--- /dev/null
+++ b/template/yoga/icon/add_tag.png
Binary files differ
diff --git a/template/yoga/index.tpl b/template/yoga/index.tpl
index df6e4d249..494d2059b 100644
--- a/template/yoga/index.tpl
+++ b/template/yoga/index.tpl
@@ -19,6 +19,23 @@
<p class="totalImages">{NB_PICTURE} {lang:total}</p>
</dd>
</dl>
+
+<!-- BEGIN tags -->
+<dl>
+ <dt>{lang:Related tags}</dt>
+ <dd>
+ <ul id="menuTagCloud">
+ <!-- BEGIN tag -->
+ <li>
+ <a href="{tags.tag.URL_ADD}" title="{tags.tag.TITLE_ADD}"><img src="{pwg_root}{themeconf:icon_dir}/add_tag.png" alt="+"></a>
+ <a href="{tags.tag.URL}" class="{tags.tag.CLASS}" title="{tags.tag.TITLE}">{tags.tag.NAME}</a>
+ </li>
+ <!-- END tag -->
+ </ul>
+ </dd>
+</dl>
+<!-- END tags -->
+
<dl>
<dt>{lang:special_categories}</dt>
<dd>
diff --git a/template/yoga/menubar.css b/template/yoga/menubar.css
index b1a768aa9..c965d0753 100644
--- a/template/yoga/menubar.css
+++ b/template/yoga/menubar.css
@@ -95,3 +95,12 @@ FORM#quickconnect LABEL {
margin: 0 0.5em 0 0.5em;
}
+#menubar #menuTagCloud {
+ text-align: center;
+ margin: 5px 0;
+}
+
+#menubar #menuTagCloud LI
+{
+ display: inline;
+} \ No newline at end of file
diff --git a/template/yoga/picture.tpl b/template/yoga/picture.tpl
index 50fcf5f5f..82260bc96 100644
--- a/template/yoga/picture.tpl
+++ b/template/yoga/picture.tpl
@@ -107,8 +107,8 @@
<td class="value">{INFO_FILESIZE}</td>
</tr>
<tr>
- <td class="label">{lang:Keywords}</td>
- <td class="value">{INFO_KEYWORDS}</td>
+ <td class="label">{lang:Tags}</td>
+ <td class="value">{INFO_TAGS}</td>
</tr>
<tr>
<td class="label">{lang:Categories}</td>
diff --git a/template/yoga/search.tpl b/template/yoga/search.tpl
index ca7e8346b..6a3fb9f1e 100644
--- a/template/yoga/search.tpl
+++ b/template/yoga/search.tpl
@@ -35,6 +35,16 @@
<input type="text" style="width: 300px" name="search_author" size="30" />
</td>
</tr>
+
+ <tr>
+ <td colspan="2"><b>{lang:Search tags} :</b></td>
+ <td colspan="2" valign="middle">
+ {TAG_SELECTION}
+ <br /><label><input type="radio" name="tag_mode" value="AND" checked="checked" /> {lang:All tags}</label>
+ <br /><label><input type="radio" name="tag_mode" value="OR" /> {lang:Any tag}</label>
+ </td>
+ </tr>
+
<tr>
<td colspan="2"><b>{L_SEARCH_DATE} :</b>
<td colspan="2" valign="middle">
diff --git a/template/yoga/search_rules.tpl b/template/yoga/search_rules.tpl
index aac2586fe..921df4a12 100644
--- a/template/yoga/search_rules.tpl
+++ b/template/yoga/search_rules.tpl
@@ -9,6 +9,18 @@
<li>{words.CONTENT}</li>
<!-- END words -->
+ <!-- BEGIN tags -->
+ <li>
+ <p>{tags.LIST_INTRO}</p>
+
+ <ul>
+ <!-- BEGIN tag -->
+ <li>{tags.tag.NAME}</li>
+ <!-- END tag -->
+ </ul>
+ </li>
+ <!-- END tags -->
+
<!-- BEGIN author -->
<li>{author.CONTENT}</li>
<!-- END author -->
diff --git a/template/yoga/tags.tpl b/template/yoga/tags.tpl
new file mode 100644
index 000000000..33f69ca69
--- /dev/null
+++ b/template/yoga/tags.tpl
@@ -0,0 +1,17 @@
+<!-- $Id: comments.tpl 960 2005-12-03 17:33:38Z chrisaga $ -->
+<div id="content">
+
+ <div class="titrePage">
+ <ul class="categoryActions">
+ <li><a href="{U_HOME}" title="{lang:return to homepage}"><img src="{themeconf:icon_dir}/home.png" class="button" alt="{lang:home}"/></a></li>
+ </ul>
+ <h2>{lang:Tags}</h2>
+ </div>
+
+ <ul id="fullTagCloud">
+ <!-- BEGIN tag -->
+ <li><a href="{tag.URL}" class="{tag.CLASS}" title="{tag.TITLE}">{tag.NAME}</a></li>
+ <!-- END tag -->
+ </ul>
+
+</div> <!-- content -->