aboutsummaryrefslogtreecommitdiff
path: root/ratatoeskr/templates/src
diff options
context:
space:
mode:
authorKevin Chabowski <kevin@kch42.de>2012-05-26 21:52:40 +0200
committerKevin Chabowski <kevin@kch42.de>2012-05-26 21:52:40 +0200
commit88099c2986b9fd75fb4de3ae2066b66770bbe8ef (patch)
treec8086228367fb988a940b4408160076c5102c405 /ratatoeskr/templates/src
parent0915d74865b0cab61c3a505e802b80ac048cdd3f (diff)
parent04b47bc50dd147ad2156a29bdb274049f99d9bce (diff)
downloadratatoeskr-cms-88099c2986b9fd75fb4de3ae2066b66770bbe8ef.tar.gz
ratatoeskr-cms-88099c2986b9fd75fb4de3ae2066b66770bbe8ef.tar.bz2
ratatoeskr-cms-88099c2986b9fd75fb4de3ae2066b66770bbe8ef.zip
Merge branch 'feature-ui-improvements' into develop
Diffstat (limited to 'ratatoeskr/templates/src')
-rw-r--r--ratatoeskr/templates/src/systemtemplates/areyousure.html11
-rw-r--r--ratatoeskr/templates/src/systemtemplates/content_write.html57
-rw-r--r--ratatoeskr/templates/src/systemtemplates/image_list.html6
-rwxr-xr-xratatoeskr/templates/src/systemtemplates/master.html9
-rw-r--r--ratatoeskr/templates/src/systemtemplates/repos.html6
-rw-r--r--ratatoeskr/templates/src/systemtemplates/sections.html5
-rw-r--r--ratatoeskr/templates/src/systemtemplates/settings.html2
-rw-r--r--ratatoeskr/templates/src/systemtemplates/styles.html6
-rw-r--r--ratatoeskr/templates/src/systemtemplates/tags_overview.html45
-rw-r--r--ratatoeskr/templates/src/systemtemplates/templates.html6
-rw-r--r--ratatoeskr/templates/src/systemtemplates/users.html4
11 files changed, 77 insertions, 80 deletions
diff --git a/ratatoeskr/templates/src/systemtemplates/areyousure.html b/ratatoeskr/templates/src/systemtemplates/areyousure.html
deleted file mode 100644
index 0d40585..0000000
--- a/ratatoeskr/templates/src/systemtemplates/areyousure.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<ste:load name="master.html" />
-<ste:block name="content">
- <div class="pos_center">
- <h2><ste:escape>$question</ste:escape></h2>
- ?{$moredetails|<p><ste:escape>$moredetails</ste:escape></p>|}
- <form action="$callback" method="post">
- <input type="submit" class="yes_btn" name="yes" value="<ste:escape>?{$yestext|$yestext|<ste:get_translation for='yes' raw='y' />}</ste:escape>" />
- <input type="submit" class="no_btn" name="no" value="<ste:escape>?{$notext|$notext|<ste:get_translation for='no' raw='y' />}</ste:escape>" />
- </form>
- </div>
-</ste:block>
diff --git a/ratatoeskr/templates/src/systemtemplates/content_write.html b/ratatoeskr/templates/src/systemtemplates/content_write.html
index 3d63c61..08d6ec1 100644
--- a/ratatoeskr/templates/src/systemtemplates/content_write.html
+++ b/ratatoeskr/templates/src/systemtemplates/content_write.html
@@ -26,33 +26,40 @@
</div>
<div class="column_right">
- <h2><ste:get_translation for="settings_meta" /></h2>
-
- <p><ste:get_translation for="urlname" />: <input type="text" name="urlname" value="<ste:escape>$urlname</ste:escape>" class="fullwidth" /></p>
- <p>
- <ste:get_translation for="article_section" />:
- <select name="section" class="fullwidth">
- <ste:foreach array="sections" value="section_name">
- <option value="<ste:escape>$section_name</ste:escape>"?{~{$section_name|eq|$article_section}| selected="selected"|}><ste:escape>$section_name</ste:escape></option>
- </ste:foreach>
- </select>
- </p>
- <p><ste:get_translation for="tags_cs" />: <input type="text" name="tags" value="<ste:escape>$tags</ste:escape>" class="fullwidth" /></p>
- <p><ste:get_translation for="date_time" />:<br />(YYYY-MM-DD HH:MM:SS) <input type="text" name="date"?{$date| value="<ste:date timestamp='$date'>%Y-%m-%d %H:%M:%S</ste:date>"|} class="fullwidth" /></p>
- <p>
- <ste:get_translation for="article_status" />:
- <ste:set var="article_status">?{$article_status|$article_status|1}</ste:set>
- <select name="article_status" class="fullwidth">
- <option value="0"?{~{$article_status|eq|0}| selected="selected"|}><ste:get_translation for="article_status_hidden" /></option>
- <option value="1"?{~{$article_status|eq|1}| selected="selected"|}><ste:get_translation for="article_status_live" /></option>
- <option value="2"?{~{$article_status|eq|2}| selected="selected"|}><ste:get_translation for="article_status_sticky" /></option>
- </select>
- </p>
- <p><ste:get_translation for="allow_comments" />: <input type="checkbox" name="allow_comments" value="yes" ?{$allow_comments|checked="checked" |}/></p>
+ <div class="articleeditor-metabar-element">
+ <h2><ste:get_translation for="settings_meta" /></h2>
+ <div class="articleeditor-metabar-element-content">
+ <p><ste:get_translation for="urlname" />: <input type="text" name="urlname" value="<ste:escape>$urlname</ste:escape>" class="fullwidth" /></p>
+ <p>
+ <ste:get_translation for="article_section" />:
+ <select name="section" class="fullwidth">
+ <ste:foreach array="sections" value="section_name">
+ <option value="<ste:escape>$section_name</ste:escape>"?{~{$section_name|eq|$article_section}| selected="selected"|}><ste:escape>$section_name</ste:escape></option>
+ </ste:foreach>
+ </select>
+ </p>
+ <p><ste:get_translation for="tags_cs" />: <input type="text" name="tags" value="<ste:escape>$tags</ste:escape>" class="fullwidth" /></p>
+ <p><ste:get_translation for="date_time" />:<br />(YYYY-MM-DD HH:MM:SS) <input type="text" name="date"?{$date| value="<ste:date timestamp='$date'>%Y-%m-%d %H:%M:%S</ste:date>"|} class="fullwidth" /></p>
+ <p>
+ <ste:get_translation for="article_status" />:
+ <ste:set var="article_status">?{$article_status|$article_status|1}</ste:set>
+ <select name="article_status" class="fullwidth">
+ <option value="0"?{~{$article_status|eq|0}| selected="selected"|}><ste:get_translation for="article_status_hidden" /></option>
+ <option value="1"?{~{$article_status|eq|1}| selected="selected"|}><ste:get_translation for="article_status_live" /></option>
+ <option value="2"?{~{$article_status|eq|2}| selected="selected"|}><ste:get_translation for="article_status_sticky" /></option>
+ </select>
+ </p>
+ <p><ste:get_translation for="allow_comments" />: <input type="checkbox" name="allow_comments" value="yes" ?{$allow_comments|checked="checked" |}/></p>
+ </div>
+ </div>
<ste:foreach array="displayed_plugins" value="plugin">
- <h2><ste:escape>$plugin[label]</ste:escape></h2>
- <ste:load name="$plugin[template]" />
+ <div class="articleeditor-metabar-element">
+ <h2><ste:escape>$plugin[label]</ste:escape></h2>
+ <div class="articleeditor-metabar-element-content">
+ <ste:load name="$plugin[template]" />
+ </div>
+ </div>
</ste:foreach>
</div>
diff --git a/ratatoeskr/templates/src/systemtemplates/image_list.html b/ratatoeskr/templates/src/systemtemplates/image_list.html
index 7b40ddc..fe600aa 100644
--- a/ratatoeskr/templates/src/systemtemplates/image_list.html
+++ b/ratatoeskr/templates/src/systemtemplates/image_list.html
@@ -47,11 +47,7 @@
</tbody>
</table>
<div>
- <input type="submit" name="delete" value="<ste:get_translation for='delete' />" />
- <select name="really_delete">
- <option value="no" selected="selected"><ste:get_translation for="no" /></option>
- <option value="yes"><ste:get_translation for="yes" /></option>
- </select>
+ <ste:default_delete_yesno />
</div>
</form>
</div>
diff --git a/ratatoeskr/templates/src/systemtemplates/master.html b/ratatoeskr/templates/src/systemtemplates/master.html
index ddf6d08..bce92b1 100755
--- a/ratatoeskr/templates/src/systemtemplates/master.html
+++ b/ratatoeskr/templates/src/systemtemplates/master.html
@@ -19,12 +19,21 @@
</ste:then>
</ste:if>
</ste:mktag>
+<ste:mktag name="default_delete_yesno">
+ <input type="submit" name="?{$_tag_parameters[name]|$_tag_parameters[name]|delete}" value="<ste:get_translation for='delete' />" />
+ <select name="really_delete">
+ <option value="no" selected="selected"><ste:get_translation for="no" /></option>
+ <option value="yes"><ste:get_translation for="yes" /></option>
+ </select>
+</ste:mktag>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta http-equiv="Content-Style-Type" content="text/css" />
<title><ste:get_translation for="section_$section" />::<ste:escape>$pagetitle</ste:escape> - Ratatöskr</title>
+ <script type="text/javascript" src="$rel_path_to_root/ratatoeskr/libs/jquery.min.js"></script>
+ <script type="text/javascript" src="$rel_path_to_root/ratatoeskr/js/backend.js"></script>
<ste:mktag name="cms_style"><link rel="stylesheet" type="text/css" media="screen" href="$rel_path_to_root/ratatoeskr/cms_style/<ste:tagcontent />" /></ste:mktag>
<ste:cms_style>layout.css</ste:cms_style>
<ste:foreach array="additional_styles" value="cssfile"><ste:cms_style>$cssfile</ste:cms_style></ste:foreach>
diff --git a/ratatoeskr/templates/src/systemtemplates/repos.html b/ratatoeskr/templates/src/systemtemplates/repos.html
index f724ece..31de6a5 100644
--- a/ratatoeskr/templates/src/systemtemplates/repos.html
+++ b/ratatoeskr/templates/src/systemtemplates/repos.html
@@ -45,11 +45,7 @@
</tbody>
</table>
<div>
- <input type="submit" name="delete_repos" value="<ste:get_translation for='delete' />" />
- <select name="really_delete">
- <option value="no" selected="selected"><ste:get_translation for="no" /></option>
- <option value="yes"><ste:get_translation for="yes" /></option>
- </select>
+ <ste:default_delete_yesno name="delete_repos" />
|
<input type="submit" name="force_repo_refresh" value="<ste:get_translation for='force_repo_refresh' />" />
</div>
diff --git a/ratatoeskr/templates/src/systemtemplates/sections.html b/ratatoeskr/templates/src/systemtemplates/sections.html
index b67563d..7ac3241 100644
--- a/ratatoeskr/templates/src/systemtemplates/sections.html
+++ b/ratatoeskr/templates/src/systemtemplates/sections.html
@@ -56,10 +56,7 @@
</tbody>
</table>
<div>
- <input type="submit" name="delete" value="<ste:get_translation for='delete' />" />&nbsp;<select name="really_delete">
- <option value="no" selected="selected"><ste:get_translation for="no" /></option>
- <option value="yes"><ste:get_translation for="yes" /></option>
- </select>
+ <ste:default_delete_yesno />
|
<input type="submit" name="make_default" value="<ste:get_translation for='make_default' />" />
|
diff --git a/ratatoeskr/templates/src/systemtemplates/settings.html b/ratatoeskr/templates/src/systemtemplates/settings.html
index b7fee48..31021fe 100644
--- a/ratatoeskr/templates/src/systemtemplates/settings.html
+++ b/ratatoeskr/templates/src/systemtemplates/settings.html
@@ -38,7 +38,7 @@
</tbody>
</table>
<div>
- <input type="submit" name="delete" value="<ste:get_translation for='delete' />" />&nbsp;<select name="really_delete"><option value="no" selected="selected"><ste:get_translation for="no" /></option><option value="yes"><ste:get_translation for="yes" /></option></select>
+ <ste:default_delete_yesno />
|
<input type="submit" name="make_default" value="<ste:get_translation for='make_default' />" />
|
diff --git a/ratatoeskr/templates/src/systemtemplates/styles.html b/ratatoeskr/templates/src/systemtemplates/styles.html
index 71464fb..30c4277 100644
--- a/ratatoeskr/templates/src/systemtemplates/styles.html
+++ b/ratatoeskr/templates/src/systemtemplates/styles.html
@@ -27,11 +27,7 @@
</tbody>
</table>
<div>
- <input type="submit" name="delete" value="<ste:get_translation for='delete' />" />
- <select name="really_delete">
- <option value="no" selected="selected"><ste:get_translation for="no" /></option>
- <option value="yes"><ste:get_translation for="yes" /></option>
- </select>
+ <ste:default_delete_yesno />
</div>
</form>
<hr />
diff --git a/ratatoeskr/templates/src/systemtemplates/tags_overview.html b/ratatoeskr/templates/src/systemtemplates/tags_overview.html
index 1f5b8d5..e82fd61 100644
--- a/ratatoeskr/templates/src/systemtemplates/tags_overview.html
+++ b/ratatoeskr/templates/src/systemtemplates/tags_overview.html
@@ -7,41 +7,52 @@
<table class="listtab">
<thead>
<tr>
+ <th>&nbsp;</th>
<th><ste:get_translation for="tag_name" /></th>
- <th><ste:get_translation for="delete" /></th>
<ste:foreach array="all_tag_langs" key="langcode" value="langname">
<th>($langcode) <ste:escape>$langname</ste:escape></th>
</ste:foreach>
- <th><ste:get_translation for="tag_add_lang" /></th>
+ <th>
+ <select name="new_language">
+ <option value="" selected="selected"><ste:get_translation for="tag_add_lang" /></option>
+ <ste:foreach array="unused_languages" key="langcode" value="langname">
+ <option value="$langcode">$langcode: <ste:escape>$langname</ste:escape></option>
+ </ste:foreach>
+ </select>
+ </th>
</tr>
</thead>
<tbody>
<ste:foreach array="alltags" value="tagdata">
<tr>
- <td>$tagdata[name]</td>
- <td>
- <a href="$rel_path_to_root/backend/content/tags/$tagdata[name]/delete"><img src="$rel_path_to_root/ratatoeskr/cms_style/images/delete.png" alt="<ste:get_translation for='delete' />" /></a>
- </td>
+ <td><input type="checkbox" name="tag_multiselect[]" value="$tagdata[id]" /></td>
+ <td><ste:escape>$tagdata[name]</ste:escape></td>
<ste:foreach array="all_tag_langs" key="langcode" value="_">
<td>
- <input type="text" name="tagtrans_${langcode}_${tagdata[name]}" value="<ste:escape>$tagdata[translations][$langcode]</ste:escape>" />
+ <input type="text" name="tagtrans_${langcode}_${tagdata[id]}" value="<ste:escape>$tagdata[translations][$langcode]</ste:escape>" />
</td>
</ste:foreach>
<td>
- <a href="$rel_path_to_root/backend/content/tags/$tagdata[name]/addtranslation"><img src="$rel_path_to_root/ratatoeskr/cms_style/images/add.png" alt="<ste:get_translation for='tag_add_lang' />" /></a>
+ <input type="text" name="tagtrans_NEW_${tagdata[id]}" />
</td>
</tr>
</ste:foreach>
+ <tr>
+ <td>&nbsp;</td>
+ <td><input type="text" name="newtagname" /></td>
+ <ste:foreach array="all_tag_langs" key="langcode" value="_">
+ <td>
+ <input type="text" name="tagtrans_${langcode}_NEW" />
+ </td>
+ </ste:foreach>
+ <td>
+ <input type="text" name="tagtrans_NEW_NEW" />
+ </td>
+ </tr>
</tbody>
</table>
- <div><input type="submit" name="edit_translations" /></div>
+ <div>
+ <ste:default_delete_yesno /> | <input type="submit" name="save_changes" value="<ste:get_translation for='save_changes' />">
+ </div>
</form>
-
- <div>
- <h2><ste:get_translation for="create_new_tag" /></h2>
- <form action="$rel_path_to_root/backend/content/tags" method="post" accept-charset="UTF-8">
- <p><ste:get_translation for="new_tag_name" />: <input type="text" name="new_tag_name" /></p>
- <p><input type="submit" name="create_new_tag" /></p>
- </form>
- </div>
</ste:block>
diff --git a/ratatoeskr/templates/src/systemtemplates/templates.html b/ratatoeskr/templates/src/systemtemplates/templates.html
index eca33cf..1a33e31 100644
--- a/ratatoeskr/templates/src/systemtemplates/templates.html
+++ b/ratatoeskr/templates/src/systemtemplates/templates.html
@@ -27,11 +27,7 @@
</tbody>
</table>
<div>
- <input type="submit" name="delete" value="<ste:get_translation for='delete' />" />
- <select name="really_delete">
- <option value="no" selected="selected"><ste:get_translation for="no" /></option>
- <option value="yes"><ste:get_translation for="yes" /></option>
- </select>
+ <ste:default_delete_yesno />
</div>
</form>
</div>
diff --git a/ratatoeskr/templates/src/systemtemplates/users.html b/ratatoeskr/templates/src/systemtemplates/users.html
index d9542a2..255759a 100644
--- a/ratatoeskr/templates/src/systemtemplates/users.html
+++ b/ratatoeskr/templates/src/systemtemplates/users.html
@@ -39,7 +39,7 @@
</tbody>
</table>
<div>
- <input type="submit" name="delete_groups" value="<ste:get_translation for='delete' />" /><select name="really_delete"><option value="no" selected="selected"><ste:get_translation for="no" /></option><option value="yes"><ste:get_translation for="yes" /></option></select>
+ <ste:default_delete_yesno name="delete_groups" />
</div>
</form>
@@ -72,7 +72,7 @@
</tbody>
</table>
<div>
- <input type="submit" name="delete_users" value="<ste:get_translation for='delete' />" /><select name="really_delete"><option value="no" selected="selected"><ste:get_translation for="no" /></option><option value="yes"><ste:get_translation for="yes" /></option></select>
+ <ste:default_delete_yesno name="delete_users" />
</div>
</form>
</div>