[geeklog-hg] geeklog: Fixed an issue where the topic control UI with long top...
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Sun Feb 16 00:13:01 EST 2014
changeset 9494:baa417edf45d
url: http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/baa417edf45d
user: dengen <taharaxp at gmail.com>
date: Sun Feb 16 14:09:17 2014 +0900
description:
Fixed an issue where the topic control UI with long topic names can wrap (bug #0001637)
diffstat:
language/english.php | 2 +
language/english_utf-8.php | 2 +
language/japanese_utf-8.php | 2 +
public_html/javascript/topic_control.js | 14 +++++++--
public_html/layout/denim/admin/common/edit_topics.thtml | 15 +++++----
public_html/layout/modern_curve/admin/common/edit_topics.thtml | 15 +++++----
public_html/layout/professional/admin/common/edit_topics.thtml | 15 +++++----
public_html/layout/professional_css/admin/common/edit_topics.thtml | 15 +++++----
system/lib-topic.php | 10 +++++-
9 files changed, 57 insertions(+), 33 deletions(-)
diffs (279 lines):
diff -r a47d8ebd654b -r baa417edf45d language/english.php
--- a/language/english.php Sat Feb 15 17:54:41 2014 +0900
+++ b/language/english.php Sun Feb 16 14:09:17 2014 +0900
@@ -1010,6 +1010,8 @@
51 => 'No',
52 => 'Story',
53 => 'Image',
+ 54 => 'Selected',
+ 55 => 'Assigned',
'breadcrumb_separator' => '>',
'breadcrumb_root' => 'Home',
'autotag_desc_topic' => '[topic:id alternate title] - Displays a link to a topic using the ID as the title. An alternate title may be specified but is not required.',
diff -r a47d8ebd654b -r baa417edf45d language/english_utf-8.php
--- a/language/english_utf-8.php Sat Feb 15 17:54:41 2014 +0900
+++ b/language/english_utf-8.php Sun Feb 16 14:09:17 2014 +0900
@@ -1010,6 +1010,8 @@
51 => 'No',
52 => 'Story',
53 => 'Image',
+ 54 => 'Selected',
+ 55 => 'Assigned',
'breadcrumb_separator' => '>',
'breadcrumb_root' => 'Home',
'autotag_desc_topic' => '[topic:id alternate title] - Displays a link to a topic using the ID as the title. An alternate title may be specified but is not required.',
diff -r a47d8ebd654b -r baa417edf45d language/japanese_utf-8.php
--- a/language/japanese_utf-8.php Sat Feb 15 17:54:41 2014 +0900
+++ b/language/japanese_utf-8.php Sun Feb 16 14:09:17 2014 +0900
@@ -1014,6 +1014,8 @@
51 => 'ã„ã„ãˆ',
52 => '話題',
53 => 'ç”»åƒ',
+ 54 => 'é¸æŠž',
+ 55 => '割り当ã¦',
'breadcrumb_separator' => '>',
'breadcrumb_root' => 'ホーム',
'autotag_desc_topic' => '[topic: id alternate title] - 話題ã¸ã®ãƒªãƒ³ã‚¯è¡¨ç¤ºã«IDを使ã†ã€‚代替ã®ã‚¿ã‚¤ãƒˆãƒ«ã¯å¿
é ˆã§ã¯ã‚ã‚Šã¾ã›ã‚“。',
diff -r a47d8ebd654b -r baa417edf45d public_html/javascript/topic_control.js
--- a/public_html/javascript/topic_control.js Sat Feb 15 17:54:41 2014 +0900
+++ b/public_html/javascript/topic_control.js Sun Feb 16 14:09:17 2014 +0900
@@ -98,17 +98,25 @@
// Change topic control display
function changeTopicControlDisplay() {
- var $display = ($('#tid option:selected').size() == 0)
+ var $display = '';
+
+ if ($('#panel_radio_options').is(':visible')) {
+ $display = ($('#topic_option_selectedtopics').is(':checked'))
+ ? 'inline-block' : 'none';
+ $('#panel_topic_options').css('display', $display);
+ }
+
+ $display = ($('#tid option:selected').size() == 0)
? 'none' : 'inline-block';
if ($('#panel_radio_options').is(':visible') &&
!$('#topic_option_selectedtopics').is(':checked')) {
$display = 'none';
}
- $inherit = 'none';
+ var $inherit = 'none';
if ($('input[name="topic_inherit_hide"]').val() == 0) {
$inherit = $display;
}
- $defalut = 'none';
+ var $defalut = 'none';
if ($('input[name="topic_default_hide"]').val() == 0) {
$defalut = $display;
}
diff -r a47d8ebd654b -r baa417edf45d public_html/layout/denim/admin/common/edit_topics.thtml
--- a/public_html/layout/denim/admin/common/edit_topics.thtml Sat Feb 15 17:54:41 2014 +0900
+++ b/public_html/layout/denim/admin/common/edit_topics.thtml Sun Feb 16 14:09:17 2014 +0900
@@ -1,27 +1,28 @@
{# begin {templatelocation} #}
-<div id="panel_radio_options" style="vertical-align:top;display:inline-block;{options_hide}">
+<div id="panel_radio_options" style="vertical-align:top;{options_hide}">
<input type="hidden" name="topic_options_hide" value="{topic_options_hide}"{xhtml}>
<label><input type="radio" name="topic_option" value="all" id="topic_option_all" {all_checked}{xhtml}> {lang_all}</label>
<label><input type="radio" name="topic_option" value="homeonly" id="topic_option_homeonly" {homeonly_checked}{xhtml}> {lang_homeonly}</label>
- <span style="{topic_option_hide}"><input type="radio" name="topic_option" id="topic_option_selectedtopics" value="selectedtopics" {selectedtopics_checked}{xhtml}></span>
+ <label><span style="{topic_option_hide}"><input type="radio" name="topic_option" id="topic_option_selectedtopics" value="selectedtopics" {selectedtopics_checked}{xhtml}></span> {lang_selected}</label>
</div>
<div id="panel_topic_options" style="vertical-align:top;display:inline-block;{topic_hide}">
- <select name="tid[]" multiple="multiple" class="multiple" size="4" id="tid">
+ <div style="vertical-align:top;">{lang_assigned}:</div>
+ <select name="tid[]" multiple="multiple" class="multiple" size="4" id="tid" style="width:140px;">
{topic_options}
</select>
</div>
<div id="panel_inherit_options" 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" id="inherit_tid">
+ <div style="vertical-align:top;">{lang_inherit}:</div>
+ <select name="inherit_tid[]" multiple="multiple" class="multiple" size="4" id="inherit_tid" style="width:140px;">
{inherit_options}
</select>
</div>
<div id="panel_default_options" 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" id="default_tid">
+ <div style="vertical-align:top;">{lang_default}:</div>
+ <select name="default_tid" id="default_tid" style="width:140px;">
{default_options}
</select>
</div>
diff -r a47d8ebd654b -r baa417edf45d public_html/layout/modern_curve/admin/common/edit_topics.thtml
--- a/public_html/layout/modern_curve/admin/common/edit_topics.thtml Sat Feb 15 17:54:41 2014 +0900
+++ b/public_html/layout/modern_curve/admin/common/edit_topics.thtml Sun Feb 16 14:09:17 2014 +0900
@@ -1,27 +1,28 @@
{# begin {templatelocation} #}
-<div id="panel_radio_options" style="vertical-align:top;display:inline-block;{options_hide}">
+<div id="panel_radio_options" style="vertical-align:top;{options_hide}">
<input type="hidden" name="topic_options_hide" value="{topic_options_hide}"{xhtml}>
<label><input type="radio" name="topic_option" value="all" id="topic_option_all" {all_checked}{xhtml}> {lang_all}</label>
<label><input type="radio" name="topic_option" value="homeonly" id="topic_option_homeonly" {homeonly_checked}{xhtml}> {lang_homeonly}</label>
- <span style="{topic_option_hide}"><input type="radio" name="topic_option" id="topic_option_selectedtopics" value="selectedtopics" {selectedtopics_checked}{xhtml}></span>
+ <label><span style="{topic_option_hide}"><input type="radio" name="topic_option" id="topic_option_selectedtopics" value="selectedtopics" {selectedtopics_checked}{xhtml}></span> {lang_selected}</label>
</div>
<div id="panel_topic_options" style="vertical-align:top;display:inline-block;{topic_hide}">
- <select name="tid[]" multiple="multiple" class="multiple" size="4" id="tid">
+ <div style="vertical-align:top;">{lang_assigned}:</div>
+ <select name="tid[]" multiple="multiple" class="multiple" size="4" id="tid" style="width:140px;">
{topic_options}
</select>
</div>
<div id="panel_inherit_options" 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" id="inherit_tid">
+ <div style="vertical-align:top;">{lang_inherit}:</div>
+ <select name="inherit_tid[]" multiple="multiple" class="multiple" size="4" id="inherit_tid" style="width:140px;">
{inherit_options}
</select>
</div>
<div id="panel_default_options" 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" id="default_tid">
+ <div style="vertical-align:top;">{lang_default}:</div>
+ <select name="default_tid" id="default_tid" style="width:140px;">
{default_options}
</select>
</div>
diff -r a47d8ebd654b -r baa417edf45d public_html/layout/professional/admin/common/edit_topics.thtml
--- a/public_html/layout/professional/admin/common/edit_topics.thtml Sat Feb 15 17:54:41 2014 +0900
+++ b/public_html/layout/professional/admin/common/edit_topics.thtml Sun Feb 16 14:09:17 2014 +0900
@@ -1,27 +1,28 @@
{# begin {templatelocation} #}
-<div id="panel_radio_options" style="vertical-align:top;display:inline-block;{options_hide}">
+<div id="panel_radio_options" style="vertical-align:top;{options_hide}">
<input type="hidden" name="topic_options_hide" value="{topic_options_hide}"{xhtml}>
<label><input type="radio" name="topic_option" value="all" id="topic_option_all" {all_checked}{xhtml}> {lang_all}</label>
<label><input type="radio" name="topic_option" value="homeonly" id="topic_option_homeonly" {homeonly_checked}{xhtml}> {lang_homeonly}</label>
- <span style="{topic_option_hide}"><input type="radio" name="topic_option" id="topic_option_selectedtopics" value="selectedtopics" {selectedtopics_checked}{xhtml}></span>
+ <label><span style="{topic_option_hide}"><input type="radio" name="topic_option" id="topic_option_selectedtopics" value="selectedtopics" {selectedtopics_checked}{xhtml}></span> {lang_selected}</label>
</div>
<div id="panel_topic_options" style="vertical-align:top;display:inline-block;{topic_hide}">
- <select name="tid[]" multiple="multiple" class="multiple" size="4" id="tid">
+ <div style="vertical-align:top;">{lang_assigned}:</div>
+ <select name="tid[]" multiple="multiple" class="multiple" size="4" id="tid" style="width:140px;">
{topic_options}
</select>
</div>
<div id="panel_inherit_options" 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" id="inherit_tid">
+ <div style="vertical-align:top;">{lang_inherit}:</div>
+ <select name="inherit_tid[]" multiple="multiple" class="multiple" size="4" id="inherit_tid" style="width:140px;">
{inherit_options}
</select>
</div>
<div id="panel_default_options" 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" id="default_tid">
+ <div style="vertical-align:top;">{lang_default}:</div>
+ <select name="default_tid" id="default_tid" style="width:140px;">
{default_options}
</select>
</div>
diff -r a47d8ebd654b -r baa417edf45d public_html/layout/professional_css/admin/common/edit_topics.thtml
--- a/public_html/layout/professional_css/admin/common/edit_topics.thtml Sat Feb 15 17:54:41 2014 +0900
+++ b/public_html/layout/professional_css/admin/common/edit_topics.thtml Sun Feb 16 14:09:17 2014 +0900
@@ -1,27 +1,28 @@
{# begin {templatelocation} #}
-<div id="panel_radio_options" style="vertical-align:top;display:inline-block;{options_hide}">
+<div id="panel_radio_options" style="vertical-align:top;{options_hide}">
<input type="hidden" name="topic_options_hide" value="{topic_options_hide}"{xhtml}>
<label><input type="radio" name="topic_option" value="all" id="topic_option_all" {all_checked}{xhtml}> {lang_all}</label>
<label><input type="radio" name="topic_option" value="homeonly" id="topic_option_homeonly" {homeonly_checked}{xhtml}> {lang_homeonly}</label>
- <span style="{topic_option_hide}"><input type="radio" name="topic_option" id="topic_option_selectedtopics" value="selectedtopics" {selectedtopics_checked}{xhtml}></span>
+ <label><span style="{topic_option_hide}"><input type="radio" name="topic_option" id="topic_option_selectedtopics" value="selectedtopics" {selectedtopics_checked}{xhtml}></span> {lang_selected}</label>
</div>
<div id="panel_topic_options" style="vertical-align:top;display:inline-block;{topic_hide}">
- <select name="tid[]" multiple="multiple" class="multiple" size="4" id="tid">
+ <div style="vertical-align:top;">{lang_assigned}:</div>
+ <select name="tid[]" multiple="multiple" class="multiple" size="4" id="tid" style="width:140px;">
{topic_options}
</select>
</div>
<div id="panel_inherit_options" 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" id="inherit_tid">
+ <div style="vertical-align:top;">{lang_inherit}:</div>
+ <select name="inherit_tid[]" multiple="multiple" class="multiple" size="4" id="inherit_tid" style="width:140px;">
{inherit_options}
</select>
</div>
<div id="panel_default_options" 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" id="default_tid">
+ <div style="vertical-align:top;">{lang_default}:</div>
+ <select name="default_tid" id="default_tid" style="width:140px;">
{default_options}
</select>
</div>
diff -r a47d8ebd654b -r baa417edf45d system/lib-topic.php
--- a/system/lib-topic.php Sat Feb 15 17:54:41 2014 +0900
+++ b/system/lib-topic.php Sun Feb 16 14:09:17 2014 +0900
@@ -438,6 +438,7 @@
$title = $_TOPICS[$count_topic]['title'];
$retval .= '<option value="' . $id . '"';
+ $retval .= ' title="' . $title . '"';
if (in_array($id, $selected_ids)) {
$retval .= ' selected="selected"';
}
@@ -449,6 +450,7 @@
$title = $LANG21[47];
$retval .= '<option value="' . $id . '"';
+ $retval .= ' title="' . $title . '"';
if (in_array($id, $selected_ids)) {
$retval .= ' selected="selected"';
}
@@ -460,6 +462,7 @@
$title = $LANG21[7];
$retval .= '<option value="' . $id . '"';
+ $retval .= ' title="' . $title . '"';
if (in_array($id, $selected_ids)) {
$retval .= ' selected="selected"';
}
@@ -491,6 +494,7 @@
}
$retval .= '<option value="' . $id . '"';
+ $retval .= ' title="' . $title . '"';
if (in_array($id, $selected_ids)) {
$retval .= ' selected="selected"';
@@ -930,8 +934,6 @@
// }
if ($show_options) {
- $topic_templates->set_var('lang_all', $LANG27[38]);
- $topic_templates->set_var('lang_homeonly', $LANG27[39]);
$topic_templates->set_var('topic_options_hide', '0');
$topic_info = $LANG27[41];
if ($topic_option == TOPIC_ALL_OPTION) {
@@ -969,6 +971,10 @@
return '';
}
+ $topic_templates->set_var('lang_all', $LANG27[38]);
+ $topic_templates->set_var('lang_homeonly', $LANG27[39]);
+ $topic_templates->set_var('lang_selected', $LANG27[54]);
+ $topic_templates->set_var('lang_assigned', $LANG27[55]);
$topic_templates->set_var('lang_inherit', $LANG27[44]);
$topic_templates->set_var('lang_default', $LANG27[45]);
More information about the geeklog-cvs
mailing list