diff options
| author | Kevin Chabowski <kevin@kch42.de> | 2012-01-13 17:37:08 +0100 |
|---|---|---|
| committer | Kevin Chabowski <kevin@kch42.de> | 2012-01-13 17:37:08 +0100 |
| commit | 1f8533ded93beac340daa2f8672b9f3d5c7e8414 (patch) | |
| tree | b000f526c358a4cf1d836b44421c58d4996dc5f2 | |
| parent | f570dab1ebfda9d80dca0d1dcffe4c195b8932be (diff) | |
| download | ratatoeskr-cms-1f8533ded93beac340daa2f8672b9f3d5c7e8414.tar.gz ratatoeskr-cms-1f8533ded93beac340daa2f8672b9f3d5c7e8414.tar.bz2 ratatoeskr-cms-1f8533ded93beac340daa2f8672b9f3d5c7e8414.zip | |
created ste:default_error / ste:default_success tags.
Will make it easier for plugin authors to get an consistentlook and feel.
16 files changed, 46 insertions, 145 deletions
diff --git a/ratatoeskr/templates/src/systemtemplates/articles.html b/ratatoeskr/templates/src/systemtemplates/articles.html index 4d9c2ff..5ba5bbd 100644 --- a/ratatoeskr/templates/src/systemtemplates/articles.html +++ b/ratatoeskr/templates/src/systemtemplates/articles.html @@ -1,15 +1,7 @@ <ste:load name="master.html" /> <ste:block name="content"> - <ste:if>$success - <ste:then> - <div class="success"><ste:escape>$success</ste:escape></div> - </ste:then> - </ste:if> - <ste:if>$error - <ste:then> - <div class="error"><ste:escape>$error</ste:escape></div> - </ste:then> - </ste:if> + <ste:default_error /> + <ste:default_success /> <form action="$rel_path_to_root/backend/content/articles" method="GET" accept-charset="UTF-8"> <div> diff --git a/ratatoeskr/templates/src/systemtemplates/comments_list.html b/ratatoeskr/templates/src/systemtemplates/comments_list.html index d19fca5..891679f 100644 --- a/ratatoeskr/templates/src/systemtemplates/comments_list.html +++ b/ratatoeskr/templates/src/systemtemplates/comments_list.html @@ -1,15 +1,7 @@ <ste:load name="master.html" /> <ste:block name="content"> - <ste:if>$success - <ste:then> - <div class="success"><ste:escape>$success</ste:escape></div> - </ste:then> - </ste:if> - <ste:if>$error - <ste:then> - <div class="error"><ste:escape>$error</ste:escape></div> - </ste:then> - </ste:if> + <ste:default_error /> + <ste:default_success /> <form action="$rel_path_to_root/backend/content/comments" method="GET" accept-charset="UTF-8"> <div> diff --git a/ratatoeskr/templates/src/systemtemplates/content_write.html b/ratatoeskr/templates/src/systemtemplates/content_write.html index fb30aa4..1a74d11 100644 --- a/ratatoeskr/templates/src/systemtemplates/content_write.html +++ b/ratatoeskr/templates/src/systemtemplates/content_write.html @@ -18,11 +18,7 @@ </div> </ste:then> </ste:if> - <ste:if>$success - <ste:then> - <div class="success">$success</div> - </ste:then> - </ste:if> + <ste:default_success /> <div class="triplecolumns"> <div class="column_left"> <h2>Linking back</h2> diff --git a/ratatoeskr/templates/src/systemtemplates/image_list.html b/ratatoeskr/templates/src/systemtemplates/image_list.html index bd985f8..83f579e 100644 --- a/ratatoeskr/templates/src/systemtemplates/image_list.html +++ b/ratatoeskr/templates/src/systemtemplates/image_list.html @@ -1,15 +1,7 @@ <ste:load name="master.html" /> <ste:block name="content"> - <ste:if>$success - <ste:then> - <div class="success"><ste:escape>$success</ste:escape></div> - </ste:then> - </ste:if> - <ste:if>$error - <ste:then> - <div class="error"><ste:escape>$error</ste:escape></div> - </ste:then> - </ste:if> + <ste:default_error /> + <ste:default_success /> <div class="dualcolumns"> <div class="column_left"> diff --git a/ratatoeskr/templates/src/systemtemplates/master.html b/ratatoeskr/templates/src/systemtemplates/master.html index 637f967..67207b9 100755 --- a/ratatoeskr/templates/src/systemtemplates/master.html +++ b/ratatoeskr/templates/src/systemtemplates/master.html @@ -1,3 +1,17 @@ +<ste:mktag name="default_success"> + <ste:if>$success + <ste:then> + <div class="success"><ste:escape>$success</ste:escape></div> + </ste:then> + </ste:if> +</ste:mktag> +<ste:mktag name="default_error"> + <ste:if>$error + <ste:then> + <div class="error"><ste:escape>$error</ste:escape></div> + </ste:then> + </ste:if> +</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> diff --git a/ratatoeskr/templates/src/systemtemplates/plugininstall.html b/ratatoeskr/templates/src/systemtemplates/plugininstall.html index 2bee9d5..7b5c586 100644 --- a/ratatoeskr/templates/src/systemtemplates/plugininstall.html +++ b/ratatoeskr/templates/src/systemtemplates/plugininstall.html @@ -1,15 +1,7 @@ <ste:load name="master.html" /> <ste:block name="content"> - <ste:if>$success - <ste:then> - <div class="success"><ste:escape>$success</ste:escape></div> - </ste:then> - </ste:if> - <ste:if>$error - <ste:then> - <div class="error"><ste:escape>$error</ste:escape></div> - </ste:then> - </ste:if> + <ste:default_error /> + <ste:default_success /> <h2><ste:get_translation for="install_from_package" /></h2> <form action="$rel_path_to_root/backend/plugin/install" method="POST" accept-charset="UTF-8" enctype="multipart/form-data"> diff --git a/ratatoeskr/templates/src/systemtemplates/pluginlist.html b/ratatoeskr/templates/src/systemtemplates/pluginlist.html index ea01335..9c64ed1 100644 --- a/ratatoeskr/templates/src/systemtemplates/pluginlist.html +++ b/ratatoeskr/templates/src/systemtemplates/pluginlist.html @@ -1,15 +1,7 @@ <ste:load name="master.html" /> <ste:block name="content"> - <ste:if>$success - <ste:then> - <div class="success"><ste:escape>$success</ste:escape></div> - </ste:then> - </ste:if> - <ste:if>$error - <ste:then> - <div class="error"><ste:escape>$error</ste:escape></div> - </ste:then> - </ste:if> + <ste:default_error /> + <ste:default_success /> <form action="$rel_path_to_root/backend/plugin/list" method="POST"> <table class="listtab fullwidth"> diff --git a/ratatoeskr/templates/src/systemtemplates/repos.html b/ratatoeskr/templates/src/systemtemplates/repos.html index c7a5267..a38c1b7 100644 --- a/ratatoeskr/templates/src/systemtemplates/repos.html +++ b/ratatoeskr/templates/src/systemtemplates/repos.html @@ -1,15 +1,7 @@ <ste:load name="master.html" /> <ste:block name="content"> - <ste:if>$success - <ste:then> - <div class="success"><ste:escape>$success</ste:escape></div> - </ste:then> - </ste:if> - <ste:if>$error - <ste:then> - <div class="error"><ste:escape>$error</ste:escape></div> - </ste:then> - </ste:if> + <ste:default_error /> + <ste:default_success /> <form action="$rel_path_to_root/backend/admin/repos" method="POST" accept-charset="UTF-8"> <h2><ste:get_translation for="add_repo" /></h2> diff --git a/ratatoeskr/templates/src/systemtemplates/sections.html b/ratatoeskr/templates/src/systemtemplates/sections.html index 8fd75bc..f842bcd 100644 --- a/ratatoeskr/templates/src/systemtemplates/sections.html +++ b/ratatoeskr/templates/src/systemtemplates/sections.html @@ -1,16 +1,9 @@ <ste:load name="master.html" /> <ste:load name="instant_select.tpl" /> <ste:block name="content"> - <ste:if>$success - <ste:then> - <div class="success"><ste:escape>$success</ste:escape></div> - </ste:then> - </ste:if> - <ste:if>$error - <ste:then> - <div class="error"><ste:escape>$error</ste:escape></div> - </ste:then> - </ste:if> + <ste:default_error /> + <ste:default_success /> + <div class="dualcolumns"> <div class="column_left"> <h2><ste:get_translation for="new_section" /></h2> diff --git a/ratatoeskr/templates/src/systemtemplates/settings.html b/ratatoeskr/templates/src/systemtemplates/settings.html index 5b0d0c5..6a5b814 100644 --- a/ratatoeskr/templates/src/systemtemplates/settings.html +++ b/ratatoeskr/templates/src/systemtemplates/settings.html @@ -1,16 +1,8 @@ <ste:load name="master.html" /> <ste:load name="instant_select.tpl" /> <ste:block name="content"> - <ste:if>$error - <ste:then> - <div class="error"><ste:escape>$error</ste:escape></div> - </ste:then> - </ste:if> - <ste:if>$success - <ste:then> - <div class="success"><ste:escape>$success</ste:escape></div> - </ste:then> - </ste:if> + <ste:default_error /> + <ste:default_success /> <form action="$rel_path_to_root/backend/admin/settings" method="POST" accept-charset="UTF-8"> <h2><ste:get_translation for="comment_settings" /></h2> diff --git a/ratatoeskr/templates/src/systemtemplates/single_comment.html b/ratatoeskr/templates/src/systemtemplates/single_comment.html index 1e8e775..48a940a 100644 --- a/ratatoeskr/templates/src/systemtemplates/single_comment.html +++ b/ratatoeskr/templates/src/systemtemplates/single_comment.html @@ -1,15 +1,7 @@ <ste:load name="master.html" /> <ste:block name="content"> - <ste:if>$success - <ste:then> - <div class="success"><ste:escape>$success</ste:escape></div> - </ste:then> - </ste:if> - <ste:if>$error - <ste:then> - <div class="error"><ste:escape>$error</ste:escape></div> - </ste:then> - </ste:if> + <ste:default_error /> + <ste:default_success /> <div class="triplecolumns"> <div class="column_left"> diff --git a/ratatoeskr/templates/src/systemtemplates/styles.html b/ratatoeskr/templates/src/systemtemplates/styles.html index bacd2c0..5865040 100644 --- a/ratatoeskr/templates/src/systemtemplates/styles.html +++ b/ratatoeskr/templates/src/systemtemplates/styles.html @@ -1,15 +1,8 @@ <ste:load name="master.html" /> <ste:block name="content"> - <ste:if>$success - <ste:then> - <div class="success"><ste:escape>$success</ste:escape></div> - </ste:then> - </ste:if> - <ste:if>$error - <ste:then> - <div class="error"><ste:escape>$error</ste:escape></div> - </ste:then> - </ste:if> + <ste:default_error /> + <ste:default_success /> + <div class="dualcolumns"> <div class="column_left"> <form action="$rel_path_to_root/backend/design/styles" method="POST"> diff --git a/ratatoeskr/templates/src/systemtemplates/tags_overview.html b/ratatoeskr/templates/src/systemtemplates/tags_overview.html index b58ddeb..eb849e8 100644 --- a/ratatoeskr/templates/src/systemtemplates/tags_overview.html +++ b/ratatoeskr/templates/src/systemtemplates/tags_overview.html @@ -1,15 +1,7 @@ <ste:load name="master.html" /> <ste:block name="content"> - <ste:if>$error - <ste:then> - <div class="error">$error</div> - </ste:then> - </ste:if> - <ste:if>$success - <ste:then> - <div class="success">$success</div> - </ste:then> - </ste:if> + <ste:default_error /> + <ste:default_success /> <form action="$rel_path_to_root/backend/content/tags" method="POST" accept-charset="UTF-8"> <table class="listtab"> diff --git a/ratatoeskr/templates/src/systemtemplates/templates.html b/ratatoeskr/templates/src/systemtemplates/templates.html index 1d15967..d70c6ba 100644 --- a/ratatoeskr/templates/src/systemtemplates/templates.html +++ b/ratatoeskr/templates/src/systemtemplates/templates.html @@ -1,15 +1,8 @@ <ste:load name="master.html" /> <ste:block name="content"> - <ste:if>$success - <ste:then> - <div class="success"><ste:escape>$success</ste:escape></div> - </ste:then> - </ste:if> - <ste:if>$error - <ste:then> - <div class="error"><ste:escape>$error</ste:escape></div> - </ste:then> - </ste:if> + <ste:default_error /> + <ste:default_success /> + <div class="dualcolumns"> <div class="column_left"> <form action="$rel_path_to_root/backend/design/templates" method="POST"> diff --git a/ratatoeskr/templates/src/systemtemplates/user.html b/ratatoeskr/templates/src/systemtemplates/user.html index 8bdce8b..a083e47 100644 --- a/ratatoeskr/templates/src/systemtemplates/user.html +++ b/ratatoeskr/templates/src/systemtemplates/user.html @@ -1,16 +1,8 @@ <ste:comment>This template looks very boring/ugly, too much empty space, should be fixed some day...</ste:comment> <ste:load name="master.html" /> <ste:block name="content"> - <ste:if>$error - <ste:then> - <div class="error"><ste:escape>$error</ste:escape></div> - </ste:then> - </ste:if> - <ste:if>$success - <ste:then> - <div class="success"><ste:escape>$success</ste:escape></div> - </ste:then> - </ste:if> + <ste:default_error /> + <ste:default_success /> <form action="$rel_path_to_root/backend/admin/users/u/$u[id]" method="POST" accept-charset="UTF-8"> <p> diff --git a/ratatoeskr/templates/src/systemtemplates/users.html b/ratatoeskr/templates/src/systemtemplates/users.html index ade4f34..9463eaf 100644 --- a/ratatoeskr/templates/src/systemtemplates/users.html +++ b/ratatoeskr/templates/src/systemtemplates/users.html @@ -1,15 +1,7 @@ <ste:load name="master.html" /> <ste:block name="content"> - <ste:if>$error - <ste:then> - <div class="error"><ste:escape>$error</ste:escape></div> - </ste:then> - </ste:if> - <ste:if>$success - <ste:then> - <div class="success"><ste:escape>$success</ste:escape></div> - </ste:then> - </ste:if> + <ste:default_error /> + <ste:default_success /> <div class="dualcolumns"> <div class="column_left"> |