changeset 8728:9e64015df9c2
url: http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/9e64015df9c2
user: Tom <websitemaster at cogeco.net>
date: Tue Jun 26 14:01:31 2012 -0400
description:
Merged with upstream
diffstat:
public_html/layout/denim/admin/common/edit_topics.thtml | 26 +++++-----
public_html/layout/denim/admin/story/storyeditor_advanced.thtml | 3 +-
2 files changed, 14 insertions(+), 15 deletions(-)
diffs (64 lines):
diff -r cc56ef2be024 -r 9e64015df9c2 public_html/layout/denim/admin/common/edit_topics.thtml
--- a/public_html/layout/denim/admin/common/edit_topics.thtml Tue Jun 26 13:59:17 2012 -0400
+++ b/public_html/layout/denim/admin/common/edit_topics.thtml Tue Jun 26 14:01:31 2012 -0400
@@ -1,33 +1,33 @@
<!-- admin/common/edit_topics.thtml { -->
-<span style="vertical-align:top;{options_hide}">
+<div style="vertical-align:top;display:inline-block;{options_hide}">
<input type="hidden" name="topic_options_hide" value="{topic_options_hide}"{xhtml}>
- <input type="radio" name="topic_option" value="all" {all_checked}> {lang_all}
- <input type="radio" name="topic_option" value="homeonly" {homeonly_checked}> {lang_homeonly}
- <span style="{topic_option_hide}"><input type="radio" name="topic_option" value="selectedtopics" {selectedtopics_checked}></span>
-</span>
-<span style="vertical-align:top;{topic_hide}">
+ <input type="radio" name="topic_option" value="all" {all_checked}{xhtml}> {lang_all}
+ <input type="radio" name="topic_option" value="homeonly" {homeonly_checked}{xhtml}> {lang_homeonly}
+ <span style="{topic_option_hide}"><input type="radio" name="topic_option" value="selectedtopics" {selectedtopics_checked}{xhtml}></span>
+</div>
+<div style="vertical-align:top;display:inline-block;{topic_hide}">
<select name="tid[]" multiple="multiple" class="multiple" size="4">
{topic_options}
</select>
-</span>
-<span style="vertical-align:top;{inherit_hide}">
+</div>
+<div style="vertical-align:top;display:inline-block;{inherit_hide}">
<input type="hidden" name="topic_inherit_hide" value="{topic_inherit_hide}"{xhtml}>
<span style="vertical-align:top;">{lang_inherit}:</span>
<select name="inherit_tid[]" multiple="multiple" class="multiple" size="4">
{inherit_options}
</select>
-</span>
-<span style="vertical-align:top;{default_hide}">
+</div>
+<div style="vertical-align:top;display:inline-block;{default_hide}">
<input type="hidden" name="topic_default_hide" value="{topic_default_hide}"{xhtml}>
<span style="vertical-align:top;">{lang_default}:</span>
<select name="default_tid">
{default_options}
</select>
-</span>
-<span style="{info_hide}">
+</div>
+<div style="{info_hide}">
<p>{topic_info}</p>
-</span>
+</div>
<!-- } admin/common/edit_topics.thtml -->
diff -r cc56ef2be024 -r 9e64015df9c2 public_html/layout/denim/admin/story/storyeditor_advanced.thtml
--- a/public_html/layout/denim/admin/story/storyeditor_advanced.thtml Tue Jun 26 13:59:17 2012 -0400
+++ b/public_html/layout/denim/admin/story/storyeditor_advanced.thtml Tue Jun 26 14:01:31 2012 -0400
@@ -109,9 +109,8 @@
</div>
<textarea cols="45" rows="20" name="bodyhtml" id="bodyhtml" class="wide">{story_bodytext}</textarea>
</dd>
+ <dd class="description">{lang_allowed_html}</dd>
</dl>
-
- <p id="editor_mode" class="description">{lang_allowed_html}</p>
</div>
</div>