[livejournal] r23371: LJSUP-13980: [Friends Feed] Remove setti...

U   trunk/htdocs/stc/widgets/journaltitles.css
U   trunk/templates/Widgets/journal_titles.tmpl

Modified: trunk/htdocs/stc/widgets/journaltitles.css
===================================================================
--- trunk/htdocs/stc/widgets/journaltitles.css	2012-11-27 09:48:30 UTC (rev 23370)
+++ trunk/htdocs/stc/widgets/journaltitles.css	2012-11-27 11:29:50 UTC (rev 23371)
@@ -1,23 +1,60 @@
-.theme-titles p span {
-    line-height: 22px;
-}
-.theme-titles label {
-    width: 10.5em;
-    float: left;
-    line-height: 22px;
-}
-.theme-titles input.text {
-    float: left;
-}
 .theme-titles-content {
-    padding-left: 10px;
-}
-.theme-title-control {
-    font-size: 11px;
-}
-#journaltitle_view, #journaltitle_cancel,
-#journalsubtitle_view, #journalsubtitle_cancel,
-#friendspagetitle_view, #friendspagetitle_cancel
-{
-    display: none;
-}
+	padding-left: 10px;
+	}
+
+.theme-titles-item {
+	position: relative;
+	margin: 0 0 0.7em;
+	*zoom: 1;
+	}
+.theme-titles-item:after {
+	content: "";
+	display: table;
+	border-collapse: collapse;
+	clear: both;
+	}
+	.theme-titles-item-head {
+		width: 10.5em;
+		float: left;
+		line-height: 22px;
+		}
+	.theme-titles-item-body {
+		float: left;
+		margin: 0;
+		}
+		.theme-titles-item-title {
+			font-weight: bold;
+			}
+		.theme-title-control {
+			font-size: 11px;
+			}
+		.theme-title-control {
+			display: none;
+			}
+		#js .theme-title-control {
+			display: inline;
+			}
+		.theme-titles-item .text {
+			margin-right: 0;
+			}
+	/* hide title without js */
+	.theme-titles-item-body-title {
+		display: none;
+		}
+	#js .theme-titles-item-body-title {
+		display: block;
+		}
+	/* show form without js */
+	.theme-titles-item-body-input {
+		display: block;
+		}
+	#js .theme-titles-item-body-input {
+		display: none;
+		}
+	/* switch form and title by edit button */
+	#js .theme-titles-edit .theme-titles-item-body-title {
+		display: none;
+		}
+	#js .theme-titles-edit .theme-titles-item-body-input {
+		display: block;
+		}

Modified: trunk/templates/Widgets/journal_titles.tmpl
===================================================================
--- trunk/templates/Widgets/journal_titles.tmpl	2012-11-27 09:48:30 UTC (rev 23370)
+++ trunk/templates/Widgets/journal_titles.tmpl	2012-11-27 11:29:50 UTC (rev 23371)
@@ -1,4 +1,4 @@
-<h2 class='widget-header'>
+<h2 class="widget-header">
     <TMPL_IF no_theme_chooser>
         <TMPL_VAR expr="ml('widget.journaltitles.title_nonum')">
     <TMPL_ELSE>
@@ -8,27 +8,59 @@
 
 <div class='theme-titles-content'>
 
-    <p class='detail'>
+    <p class="detail">
         <TMPL_VAR expr="ml('widget.journaltitles.desc')">
         <TMPL_VAR helpicon>
     </p>
 
     <TMPL_LOOP titles>
-        <form method='POST' id="<TMPL_VAR id>_form">
+        <form method="POST" id="<TMPL_VAR id>_form" data-which="<TMPL_VAR id>_form">
             <TMPL_VAR form_auth>
-            <p>
-                <label><TMPL_VAR name></label>
-                <span id='<TMPL_VAR id>_view'>
-                    <strong><TMPL_VAR value ESCAPE=HTML></strong>
-                    <a href='' class='theme-title-control' id='<TMPL_VAR id>_edit'><TMPL_VAR expr="ml('widget.journaltitles.edit')"></a>
-                </span>
-                <span id='<TMPL_VAR id>_modify'>
-                    <input type="text" maxlength="100" value="<TMPL_VAR value ESCAPE=HTML>" name="Widget[JournalTitles]_title_value" id="<TMPL_VAR id>" size="30" class='text' />
-                    <input type='hidden' name="Widget[JournalTitles]_which_title" value="<TMPL_VAR id>" />
-                    <input type='submit' name="Widget[JournalTitles]_save" value="<TMPL_VAR expr="ml('widget.journaltitles.btn')">" id='save_btn_<TMPL_VAR id>' />
-                    <a href='' class='theme-title-control' id='<TMPL_VAR id>_cancel'><TMPL_VAR expr="ml('widget.journaltitles.cancel')"></a>
-                </span>
-            </p>
+
+            <dl class="theme-titles-item">
+                <dt class="theme-titles-item-head">
+                    <label for="<TMPL_VAR id>">
+                        <TMPL_VAR name>
+                    </label>
+                </dt>
+                <dd class="theme-titles-item-body theme-titles-item-body-title" id="<TMPL_VAR id>_view">
+                    <strong class="theme-titles-item-title"><!--
+                        --><TMPL_VAR value ESCAPE=HTML><!--
+                    --></strong>
+                    <a
+                        href="javascript:void(0);"
+                        class="theme-title-control"
+                        id="<TMPL_VAR id>_edit"><!--
+                        --><TMPL_VAR expr="ml('widget.journaltitles.edit')"><!--
+                    --></a>
+                </dd>
+                <dd class="theme-titles-item-body theme-titles-item-body-input" id="<TMPL_VAR id>_modify">
+                    <input
+                        type="text"
+                        name="Widget[JournalTitles]_title_value"
+                        id="<TMPL_VAR id>"
+                        value="<TMPL_VAR value ESCAPE=HTML>"
+                        maxlength="100"
+                        size="30"
+                        class="text" />
+                    <input
+                        type="hidden"
+                        name="Widget[JournalTitles]_which_title"
+                        value="<TMPL_VAR id>" /><!--
+                    --><input
+                        type="submit"
+                        name="Widget[JournalTitles]_save"
+                        value="<TMPL_VAR expr="ml('widget.journaltitles.btn')">"
+                        id="save_btn_<TMPL_VAR id>" />
+                    <a
+                        href="javascript:void(0);"
+                        class="theme-title-control"
+                        id="<TMPL_VAR id>_cancel"><!--
+                        --><TMPL_VAR expr="ml('widget.journaltitles.cancel')"><!--
+                    --></a>
+                </dd>
+            </dl>
+
         </form>
     </TMPL_LOOP>