From 1d21e994c0cb820780ab504533622f823c0b2bb6 Mon Sep 17 00:00:00 2001
From: chschy <chschy@gmail.com>
Date: Wed, 26 Sep 2012 07:08:36 +0000
Subject: [PATCH] issue 2450 [Admin UI Refactoring] Content > RSS

git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11532 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/rss/conf/module.xml                   |   1 -
 modules/rss/rss.admin.controller.php          |  25 ----
 modules/rss/tpl/filter/insert_rss_config.xml  |   7 --
 .../tpl/filter/insert_rss_module_config.xml   |   7 --
 modules/rss/tpl/js/rss.js                     |  17 ---
 modules/rss/tpl/rss_admin_index.html          | 119 +++++++++---------
 6 files changed, 59 insertions(+), 117 deletions(-)
 delete mode 100644 modules/rss/tpl/filter/insert_rss_config.xml
 delete mode 100644 modules/rss/tpl/filter/insert_rss_module_config.xml
 delete mode 100644 modules/rss/tpl/js/rss.js

diff --git a/modules/rss/conf/module.xml b/modules/rss/conf/module.xml
index 97db269b0..08c2a89e8 100644
--- a/modules/rss/conf/module.xml
+++ b/modules/rss/conf/module.xml
@@ -6,7 +6,6 @@
         <action name="dispRssAdminIndex" type="view" index="true" standalone="true" admin_index="true" menu_name="rss" menu_index="true" />
         <action name="rss" type="view" standalone="true" />
         <action name="atom" type="view" standalone="true" />
-        <action name="procRssAdminToggleActivate" type="controller" standalone="true" />
         <action name="procRssAdminInsertConfig" type="controller" standalone="true" ruleset="insertRssConfig" />
         <action name="procRssAdminInsertModuleConfig" type="controller" standalone="true" ruleset="insertRssModuleConfig" />
     </actions>
diff --git a/modules/rss/rss.admin.controller.php b/modules/rss/rss.admin.controller.php
index 9ebf53297..479abfc89 100644
--- a/modules/rss/rss.admin.controller.php
+++ b/modules/rss/rss.admin.controller.php
@@ -119,31 +119,6 @@
         }
 
 
-        /**
-         * All Feeds with or without change
-		 *
-		 * @return Object
-         **/
-        function procRssAdminToggleActivate() {
-            $oRssModel = &getModel('rss');
-            // Get mid value
-            $module_srl = Context::get('module_srl');
-            if($module_srl) {
-                $config = $oRssModel->getRssModuleConfig($module_srl);
-                if($config->open_total_feed == 'T_N') {
-                    $this->setRssModuleConfig($module_srl, $config->open_rss, 'T_Y', $config->feed_description, $config->feed_copyright);
-                    $this->add("open_total_feed", 'T_Y');
-                }
-                else {
-                    $this->setRssModuleConfig($module_srl, $config->open_rss, 'T_N', $config->feed_description, $config->feed_copyright);
-                    $this->add("open_total_feed", 'T_N');
-                }
-            }
-
-            $this->add("module_srl", $module_srl);
-        }
-
-
         /**
          * A funciton to configure all Feeds of the RSS module
 		 *
diff --git a/modules/rss/tpl/filter/insert_rss_config.xml b/modules/rss/tpl/filter/insert_rss_config.xml
deleted file mode 100644
index b48a6dcc9..000000000
--- a/modules/rss/tpl/filter/insert_rss_config.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<filter name="insert_rss_config" module="rss" act="procRssAdminInsertConfig" confirm_msg_code="confirm_submit">
-    <form />
-    <response>
-        <tag name="error" />
-        <tag name="message" />
-    </response>
-</filter>
diff --git a/modules/rss/tpl/filter/insert_rss_module_config.xml b/modules/rss/tpl/filter/insert_rss_module_config.xml
deleted file mode 100644
index 49c55d999..000000000
--- a/modules/rss/tpl/filter/insert_rss_module_config.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<filter name="insert_rss_module_config" module="rss" act="procRssAdminInsertModuleConfig" confirm_msg_code="confirm_submit">
-    <form />
-    <response>
-        <tag name="error" />
-        <tag name="message" />
-    </response>
-</filter>
diff --git a/modules/rss/tpl/js/rss.js b/modules/rss/tpl/js/rss.js
deleted file mode 100644
index 92041982d..000000000
--- a/modules/rss/tpl/js/rss.js
+++ /dev/null
@@ -1,17 +0,0 @@
-
-function doToggleRss(module_srl) {
-  var params = new Array();
-  params['module_srl'] = module_srl;
-
-  var response_tags = new Array('error','message','module_srl','open_total_feed');
-  exec_xml('rss','procRssAdminToggleActivate',params, doChangeIcon ,response_tags );
-}
-
-function doChangeIcon(ret_obj, response_tags) {
-  var obj = document.getElementById('dotogglerss_'+ret_obj['module_srl']);
-  if(ret_obj['open_total_feed'] == 'T_N') {
-    obj.className = "buttonSet buttonDisable";
-  } else {
-    obj.className = "buttonSet buttonActive"; 
-  }
-}
diff --git a/modules/rss/tpl/rss_admin_index.html b/modules/rss/tpl/rss_admin_index.html
index 8e63e6fdb..7205c2253 100644
--- a/modules/rss/tpl/rss_admin_index.html
+++ b/modules/rss/tpl/rss_admin_index.html
@@ -1,64 +1,65 @@
-<load target="js/rss.js" usecdn="true" />
 <div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
 	<p>{$XE_VALIDATOR_MESSAGE}</p>
 </div>
-<h1 class="h1">RSS</h1>
-<form ruleset="insertRssConfig" id="fo_layout" action="./" method="post" enctype="multipart/form-data" class="form">
-	<input type="hidden" name="module" value="rss" />
-	<input type="hidden" name="act" value="procRssAdminInsertConfig" />
-	<h2 class="h2">{$lang->total_feed} {$lang->cmd_management}</h2>
-	<ul>
-		<li>
-			<p class="q">{$lang->total_feed}</p>
-			<p class="a">
-				<input type="radio" name="use_total_feed" value="Y" id="use_total_feed_yes"  <!--@if(!$total_config->use_total_feed || $total_config->use_total_feed == 'Y')-->checked="checked"<!--@end--> /> <label for="use_total_feed_yes">{$lang->use}(<a href="{getFullSiteUrl()}rss">{getFullSiteUrl()}rss</a>)</label>
-				<input type="radio" name="use_total_feed" value="N" id="use_total_feed_no" <!--@if($total_config->use_total_feed == 'N')-->checked="checked"<!--@end--> /> <label for="use_total_feed_no">{$lang->notuse}</label>
-			</p>
-		</li>
-		<li>
-			<p class="q"><label for="feed_title">{$lang->title}</label></p>
-			<p class="a"><input type="text" name="feed_title" value="{htmlspecialchars($total_config->feed_title)}" id="feed_title" /></p>
-		</li>
-		<li>
-			<p class="q"><label for="feed_description">{$lang->description}</label></p>
-			<p class="a"><textarea name="feed_description" id="feed_description" rows="8" cols="42">{$total_config->feed_description}</textarea></p>
-		</li>
-		<li>
-			<p class="q"><label for="image">{$lang->feed_image}</label></p>
+<div class="x_page-header">
+	<h1>RSS</h1>
+</div>
+<section class="section">
+	<h1>{$lang->total_feed} {$lang->cmd_management}</h1>
+	<form ruleset="insertRssConfig" action="./" method="post" enctype="multipart/form-data" class="x_form-horizontal">
+		<input type="hidden" name="module" value="rss" />
+		<input type="hidden" name="act" value="procRssAdminInsertConfig" />
+		<div class="x_control-group">
+			<label for="">{$lang->total_feed}</label>
+			<label class="x_inline">
+				<input type="radio" name="use_total_feed" value="Y" id="use_total_feed_yes" checked="checked"|cond="!$total_config->use_total_feed || $total_config->use_total_feed == 'Y'" />{$lang->use}(<a href="{getFullSiteUrl()}rss">{getFullSiteUrl()}rss</a>)
+			</label>
+			<label class="x_inline">
+				<input type="radio" name="use_total_feed" value="N" id="use_total_feed_no" checked="checked"|cond="$total_config->use_total_feed == 'N'" />{$lang->notuse}
+			</label>
+		</div>
+		<div class="x_control-group">
+			<label for="feed_title">{$lang->title}</label>
+			<input type="text" name="feed_title" value="{htmlspecialchars($total_config->feed_title)}" id="feed_title" />
+		</div>
+		<div class="x_control-group">
+			<label for="feed_description">{$lang->description}</label>
+			<textarea name="feed_description" id="feed_description" rows="8" cols="42">{$total_config->feed_description}</textarea>
+		</div>
+		<div class="x_control-group">
+			<label for="image">{$lang->feed_image}</label>
 			<!--@if($total_config->image)-->
-			<p class="a">
 				<img src="../../../{$total_config->image}" alt="image" />
 				<input type="checkbox" name="del_image" value="Y" id="del_image" />
 				<label for="del_image">{$lang->cmd_delete}</label>
-			</p>
 			<!--@end-->
 			<p class="a"><input type="file" name="image" value="" id="image" /></p>
-		</li>
-		<li>
-			<p class="q"><label for="feed_copyright">{$lang->feed_copyright}</label></p>
-			<p class="a"><input type="text" name="feed_copyright" value="{htmlspecialchars($total_config->feed_copyright)}" id="feed_copyright" /></p>
-		</li>
-		<li>
-			<p class="q"><label for="feed_document_count">{$lang->feed_document_count}</label></p>
-			<p class="a"><input type="text" name="feed_document_count" value="{$total_config->feed_document_count}" id="feed_document_count" /></p>
-		</li>
-	</ul>
-	<div class="btnArea">
-		<span class="btn small"><input type="submit" value="{$lang->cmd_save}" /></span>
-	</div>
-</form>
-<h2 class="h2">{$lang->feed} {$lang->cmd_management}</h2>
-<div class="table form">
-	<table width="100%" border="1" cellspacing="0">
+		</div>
+		<div class="x_control-group">
+			<label for="feed_copyright">{$lang->feed_copyright}</label>
+			<input type="text" name="feed_copyright" value="{htmlspecialchars($total_config->feed_copyright)}" id="feed_copyright" />
+		</div>
+		<div class="x_control-group">
+			<label for="feed_document_count">{$lang->feed_document_count}</label>
+			<input type="text" name="feed_document_count" value="{$total_config->feed_document_count}" id="feed_document_count" />
+		</div>
+		<div class="x_clearfix">
+			<div class="x_pull-right">
+				<button type="submit" class="x_btn x_btn-primary">{$lang->cmd_save}</button>
+			</div>
+		</div>
+	</form>
+</section>
+<section class="section">
+	<h1>{$lang->feed} {$lang->cmd_management}</h1>
+	<table class="x_table x_table-striped x_table-hover">
 		<thead>
 			<tr>
-				<th scope="col">{$lang->mid}</th>
-				<th scope="col" class="title">{$lang->description}</th>
-				<th scope="col">{$lang->open_rss}</th>
-				<th scope="col">
-					<label for="feed_integration">{$lang->open_feed_to_total}</label>
-				</th>
-				<th scope="col">{$lang->cmd_save}</th>
+				<th>{$lang->mid}</th>
+				<th>{$lang->description}</th>
+				<th>{$lang->open_rss}</th>
+				<th>{$lang->open_feed_to_total}</th>
+				<th style="width:50px">{$lang->cmd_save}</th>
 			</tr>
 		</thead>
 		<tbody>
@@ -67,24 +68,22 @@
 					<input type="hidden" name="act" value="procRssAdminInsertModuleConfig" />
 					<input type="hidden" name="success_return_url" value="{getUrl('', 'module', $module, 'act', 'dispRssAdminIndex')}" />
 					<input type="hidden" name="target_module_srl" value="{$key}" />
-					<th scope="row" class="nowr">
+					<th>
 						<!--@if($value['url'])--><a href="{$value['url']}" target="_blank"><!--@endif-->{$value['mid']}<!--@if($value['url'])--></a><!--@endif-->
 					</th>
 					<td class="title">{$value['feed_description']}</td>
-					<td class="nowr">
+					<td>
 						<!--@foreach($lang->open_rss_types as $key2=>$value2)-->
-						<input type="radio" name="open_rss" value="{$key2}" id="feed_open_{$key2}" <!--@if($key2 == $value['open_feed'])-->checked="checked"<!--@end--> /><label for="feed_open_{$key2}">{$value2}</label>
+						<label class="x_inline"><input type="radio" name="open_rss" value="{$key2}" id="feed_open_{$key2}" <!--@if($key2 == $value['open_feed'])-->checked="checked"<!--@end--> />{$value2}</label>
 						<!--@end-->
 					</td>
-					<td class="nowr">
-						<input type="radio" name="open_total_feed" value="N" id="open_total_feed_N" <!--@if($value['open_total_feed'] == 'N')-->checked="checked"<!--@end--> />
-						<label for="open_total_feed_N">{$lang->use}</label>
-						<input type="radio" name="open_total_feed" value="T_N" id="open_total_feed_T_N" <!--@if($value['open_total_feed'] == 'T_N')-->checked="checked"<!--@end--> />
-						<label for="open_total_feed_T_N">{$lang->notuse}</label>
+					<td>
+						<label class="x_inline"><input type="radio" name="open_total_feed" value="N" id="open_total_feed_N" <!--@if($value['open_total_feed'] == 'N')-->checked="checked"<!--@end--> />{$lang->use}</label>
+						<label class="x_inline"><input type="radio" name="open_total_feed" value="T_N" id="open_total_feed_T_N" <!--@if($value['open_total_feed'] == 'T_N')-->checked="checked"<!--@end--> />{$lang->notuse}</label>
 					</td>
-					<td class="nowr"><input type="submit" value="{$lang->cmd_save}" class="text" /></td>
+					<td><button type="submit" class="x_btn x_btn-link">{$lang->cmd_save}</button></td>
 				</form>
 			</tr>
 		</tbody>
 	</table>
-</div>
+</section>