From 8e8d273e596fdacb52f2466c2b78cb856e1d6bd4 Mon Sep 17 00:00:00 2001 From: lsces Date: Sat, 31 May 2014 21:33:55 +0100 Subject: Modify templates for ink framework --- templates/admin_articles.tpl | 12 ++++++------ templates/admin_topics.tpl | 6 +++--- templates/admin_types.tpl | 10 +++++----- templates/article_display.tpl | 4 ++-- templates/article_filter_inc.tpl | 2 +- templates/article_history.tpl | 2 +- templates/articles_mini_search.tpl | 2 +- templates/center_list_articles.tpl | 4 +--- templates/edit_article.tpl | 18 +++++++++--------- templates/edit_topic.tpl | 10 +++++----- 10 files changed, 34 insertions(+), 36 deletions(-) diff --git a/templates/admin_articles.tpl b/templates/admin_articles.tpl index 12cc97c..64c35f5 100644 --- a/templates/admin_articles.tpl +++ b/templates/admin_articles.tpl @@ -7,7 +7,7 @@ {legend legend="CMS Settings"} {foreach from=$formCmsSettings key=feature item=output} -
+
{formlabel label=$output.label for=$feature} {forminput} {html_checkboxes name="$feature" values="y" checked=$gBitSystem->getConfig($feature) labels=false id=$feature} @@ -16,7 +16,7 @@
{/foreach} -
+
{formlabel label="Maximum Articles" for="articles-maxhome"} {forminput} @@ -24,7 +24,7 @@ {/forminput}
-
+
{formlabel label="Article Description Length" for="articles-descrlength"} {forminput} {tr}characters{/tr} @@ -32,7 +32,7 @@ {/forminput}
-
+
{formlabel label="Article Image Size" for="article_topic_thumbnail_size"} {forminput} {html_options values=$imageSizes options=$imageSizes name="articles_image_size" selected=$gBitSystem->getConfig('articles_image_size')|default:small} @@ -45,7 +45,7 @@ {jstab title="Article Listings"} {legend legend="CMS Settings"} {foreach from=$formArticleListing key=feature item=output} -
+
{formlabel label=$output.label for=$feature} {forminput} {html_checkboxes name="$feature" values="y" checked=$gBitSystem->getConfig($feature) labels=false id=$feature} @@ -58,7 +58,7 @@ {/jstabs}
- +
{/form} {/strip} diff --git a/templates/admin_topics.tpl b/templates/admin_topics.tpl index be3a6cd..823ca0c 100644 --- a/templates/admin_topics.tpl +++ b/templates/admin_topics.tpl @@ -14,7 +14,7 @@ {form legend="Create a new Topic" enctype="multipart/form-data"} -
+
{formlabel label="Topic Title" for="topic_name"} {forminput} @@ -22,7 +22,7 @@ {/forminput}
-
+
{formlabel label="Upload Image" for="t-image"} {forminput} @@ -31,7 +31,7 @@
- +
{/form} diff --git a/templates/admin_types.tpl b/templates/admin_types.tpl index 05a7ab1..838b6d6 100644 --- a/templates/admin_types.tpl +++ b/templates/admin_types.tpl @@ -23,7 +23,7 @@ {counter name=th} {section name=user loop=$types} - + @@ -45,7 +45,7 @@ {formhelp note='hover over the number to see the column header'}
-
+
{/form} @@ -91,14 +91,14 @@ {/section}
-
+
{/form} {/jstab} {jstab title="Add Article Type"} {form legend="Create New Article Type"} -
+
{formlabel label="Create new Type" for="add_type"} {forminput} @@ -107,7 +107,7 @@
- +
{/form} {/jstab} diff --git a/templates/article_display.tpl b/templates/article_display.tpl index 33610f9..1dd4358 100644 --- a/templates/article_display.tpl +++ b/templates/article_display.tpl @@ -25,7 +25,7 @@
{if $article.show_author eq 'y'} {* can't really use the link here since it only works when the user uses his login name *} - {displayname hash=$article}  + {$article.author_name}  {/if} {if $article.show_pubdate eq 'y'} @@ -105,7 +105,7 @@
{if $article.status_id == $smarty.const.ARTICLE_STATUS_PENDING && !$preview} -
+
{formlabel label="Approve or deny Submission"} {forminput} {if $gContent->hasUserPermission( 'p_articles_approve_submission' )} diff --git a/templates/article_filter_inc.tpl b/templates/article_filter_inc.tpl index ce6b8ee..4755440 100644 --- a/templates/article_filter_inc.tpl +++ b/templates/article_filter_inc.tpl @@ -16,7 +16,7 @@ {html_options options=$filter.topic values=$filter.topic name=topic_id selected=$smarty.request.topic_id} - + diff --git a/templates/article_history.tpl b/templates/article_history.tpl index d2c83ec..4b68169 100644 --- a/templates/article_history.tpl +++ b/templates/article_history.tpl @@ -103,7 +103,7 @@ {if $gContent->hasUserPermission( 'p_articles_remove' )}
- +
{/if} {/form} diff --git a/templates/articles_mini_search.tpl b/templates/articles_mini_search.tpl index e3246c6..9984484 100644 --- a/templates/articles_mini_search.tpl +++ b/templates/articles_mini_search.tpl @@ -1,6 +1,6 @@ {form method="get" ipackage="articles" ifile="list.php"} - + @@ -42,7 +42,7 @@ {/forminput}
-
+
{formlabel label="Author Name" for="author_name"} {forminput} @@ -51,7 +51,7 @@
{if $topics or $gContent->hasUserPermission( 'p_articles_admin' )} -
+
{formlabel label="Topic" for="topic_id"} {forminput} {if $topics} @@ -75,7 +75,7 @@ {if $types[t].use_ratings eq 'y'}{assign var=ratings value=TRUE}{/if} {/section} {else} -
+
{formlabel label="Type" for="article_type_id"} {forminput} @@ -122,8 +122,8 @@ {/if}
-   - +   +
{if $gBitSystem->isFeatureActive( 'articles_attachments' ) } @@ -136,7 +136,7 @@ {jstab title="Advanced"} {legend legend="Publication and Expiration Dates"} -
+
{formlabel label="Publish Date" for=""} {forminput} @@ -146,7 +146,7 @@ {/forminput}
-
+
{formlabel label="Expiration Date" for=""} {forminput} diff --git a/templates/edit_topic.tpl b/templates/edit_topic.tpl index daec797..77ef448 100644 --- a/templates/edit_topic.tpl +++ b/templates/edit_topic.tpl @@ -14,7 +14,7 @@ {formfeedback success=$gContent->mSuccess error=$gContent->mErrors} -
+
{formlabel label="Topic Name" for="topic_name"} {forminput} @@ -22,14 +22,14 @@ {/forminput}
-
+
-
+
{formlabel label="Upload Image" for="t-image"} {forminput} @@ -37,7 +37,7 @@ {/forminput}
-
+
{formlabel label="Current Image"} {forminput} {if $gContent->mInfo.has_topic_image eq 'y'} @@ -51,7 +51,7 @@
- +
{/form}
-- cgit v1.3