[zotonic] push by profile.url - Select correct language tab on admin page. on 2010-11-10 13:21 GMT
zot...@googlecode.com
Author: Marc Worrell <ma...@worrell.nl>
Date: Wed Nov 10 05:21:34 2010
Log: Select correct language tab on admin page.
http://code.google.com/p/zotonic/source/detail?r=fb907fb4d9
Modified:
/modules/mod_admin/templates/_admin_edit_basics.tpl
/modules/mod_admin/templates/_admin_edit_body.tpl
/modules/mod_admin/templates/_admin_translation_tabs.tpl
/modules/mod_admin/templates/admin_edit.tpl
=======================================
--- /modules/mod_admin/templates/_admin_edit_basics.tpl Tue Nov 9 16:52:41
2010
+++ /modules/mod_admin/templates/_admin_edit_basics.tpl Wed Nov 10 05:21:34
2010
@@ -2,31 +2,27 @@
<div class="item-wrapper">
{% with r.language|default:[z_language] as r_language %}
<div class="translations ui-tabs" id="{{ #tabs }}">
- {% tabs id=#tabs %}
-
{% include "_admin_translation_tabs.tpl" prefix=#prefix
r_language=r_language %}
{% for code,lang in m.config.i18n.language_list.list %}
- {% if lang.is_enabled %}
- <div id="{{ #prefix }}-{{ code }}" class="language-{{ code }} item
ui-tabs-hide">
- <fieldset class="admin-form">
- <div class="form-item clearfix">
- <label for="field-title${{ code }}">{_ Title _} ({{ code
}})</label>
- <input type="text" id="field-title${{ code }}" name="title${{ code
}}" value="{{ r.translation[code].title }}" {% if not
is_editable %}disabled="disabled"{% endif %}/>
- </div>
-
- <div class="form-item clearfix">
- <label for="field-summary${{ code }}">{_ Summary _} ({{ code
}})</label>
- <textarea rows="2" cols="10" id="field-summary${{ code }}"
name="summary${{ code }}" class="intro" {% if not
is_editable %}disabled="disabled"{% endif %}>{{ r.translation[code].summary
}}</textarea>
- </div>
-
- <div class="form-item clearfix">
- <label for="field-short-title${{ code }}">{_ Short title _} ({{
code }})</label>
- <input type="text" style="width: 50%" id="field-short-title${{
code }}" name="short_title${{ code }}" value="{{
r.translation[code].short_title }}" {% if not
is_editable %}disabled="disabled"{% endif %} />
- </div>
- </fieldset>
- </div>
- {% endif %}
+ <div id="{{ #prefix }}-{{ code }}" class="language-{{ code }} item
ui-tabs-hide">
+ <fieldset class="admin-form">
+ <div class="form-item clearfix">
+ <label for="field-title${{ code }}">{_ Title _} ({{ code }})</label>
+ <input type="text" id="field-title${{ code }}" name="title${{ code
}}" value="{{ r.translation[code].title }}" {% if not
is_editable %}disabled="disabled"{% endif %}/>
+ </div>
+
+ <div class="form-item clearfix">
+ <label for="field-summary${{ code }}">{_ Summary _} ({{ code
}})</label>
+ <textarea rows="2" cols="10" id="field-summary${{ code }}"
name="summary${{ code }}" class="intro" {% if not
is_editable %}disabled="disabled"{% endif %}>{{ r.translation[code].summary
}}</textarea>
+ </div>
+
+ <div class="form-item clearfix">
+ <label for="field-short-title${{ code }}">{_ Short title _} ({{
code }})</label>
+ <input type="text" style="width: 50%" id="field-short-title${{ code
}}" name="short_title${{ code }}" value="{{ r.translation[code].short_title
}}" {% if not is_editable %}disabled="disabled"{% endif %} />
+ </div>
+ </fieldset>
+ </div>
{% endfor %}
</div>
{% endwith %}
=======================================
--- /modules/mod_admin/templates/_admin_edit_body.tpl Tue Nov 9 16:52:41
2010
+++ /modules/mod_admin/templates/_admin_edit_body.tpl Wed Nov 10 05:21:34
2010
@@ -2,31 +2,27 @@
{% with r.language|default:[z_language] as r_language %}
<div class="item-wrapper">
<div class="translations ui-tabs" id="{{ #tabs }}">
- {% tabs id=#tabs %}
-
{% include "_admin_translation_tabs.tpl" prefix=#prefix
r_language=r_language %}
{% for code,lang in m.config.i18n.language_list.list %}
- {% if lang.is_enabled %}
- <div id="{{ #prefix }}-{{ code }}" class="ui-tabs-hide">
- <fieldset class="admin-form">
- {% button action={zmedia id=id media_div_id=#media
subject_id=id} text=_"Add media to body" id="zmedia-open-dialog"
style="display:none" %}
- {% wire action={event type='named' name="zmedia"
action={zmedia id=id media_div_id=#media subject_id=id}} %}
- {% wire action={event type='named' name="zlink"
action={dialog_open title="Add link"
template="_action_dialog_zlink.tpl"}} %}
-
- <div class="form-item clearfix">
- {% if is_editable %}
- <textarea rows="10" cols="10" id="rsc-body${{ code }}"
name="body${{ code }}" class="body tinymce-init">{{
r.translation[code].body|escape }}</textarea>
- {% else %}
- {{ r.translation[code].body }}
- {% endif %}
- </div>
- </fieldset>
-
- {% include "_admin_save_buttons.tpl" %}
-
- </div>
- {% endif %}
+ <div id="{{ #prefix }}-{{ code }}" class="ui-tabs-hide">
+ <fieldset class="admin-form">
+ {% button action={zmedia id=id media_div_id=#media
subject_id=id} text=_"Add media to body" id="zmedia-open-dialog"
style="display:none" %}
+ {% wire action={event type='named' name="zmedia"
action={zmedia id=id media_div_id=#media subject_id=id}} %}
+ {% wire action={event type='named' name="zlink"
action={dialog_open title="Add link"
template="_action_dialog_zlink.tpl"}} %}
+
+ <div class="form-item clearfix">
+ {% if is_editable %}
+ <textarea rows="10" cols="10" id="rsc-body${{ code }}"
name="body${{ code }}" class="body tinymce-init">{{
r.translation[code].body|escape }}</textarea>
+ {% else %}
+ {{ r.translation[code].body }}
+ {% endif %}
+ </div>
+ </fieldset>
+
+ {% include "_admin_save_buttons.tpl" %}
+
+ </div>
{% endfor %}
</div>
</div>
=======================================
--- /modules/mod_admin/templates/_admin_translation_tabs.tpl Wed Nov 10
02:35:22 2010
+++ /modules/mod_admin/templates/_admin_translation_tabs.tpl Wed Nov 10
05:21:34 2010
@@ -1,7 +1,5 @@
<ul class="ui-tabs-nav">
{% for code,lang in m.config.i18n.language_list.list %}
- {% if lang.is_enabled %}
- <li class="tab-{{ code }}" {% if not code|
member:r_language %}style="display: none"{% endif %}><a href="#{{ prefix
}}-{{ code }}">{{ lang.language }}</a></li>
- {% endif %}
+ <li class="tab-{{ code }}" {% if not code|member:r_language or not
lang.is_enabled %}style="display: none"{% endif %} data-index="{{
forloop.counter0 }}"><a href="#{{ prefix }}-{{ code }}">{{ lang.language
}}</a></li>
{% endfor %}
</ul>
=======================================
--- /modules/mod_admin/templates/admin_edit.tpl Wed Nov 10 04:30:07 2010
+++ /modules/mod_admin/templates/admin_edit.tpl Wed Nov 10 05:21:34 2010
@@ -118,15 +118,25 @@
}
- /* Handle translations tabs with tinymce controls in it. */
+ /* Initialize translation tabs, select correct language */
+ $(".translations").tabs();
+
$(".translations").bind('tabsshow', function(event, ui) {
$(".tinymce-init", ui.panel).each(function() {
var mce_id = $(this).attr('id');
setTimeout(function() { tinyMCE.execCommand('mceAddControl',false,
mce_id); }, 200);
}).removeClass('tinymce-init').addClass('tinymce');
-
$(".translations").tabs("select", ui.index);
- })
+ });
+
+ var tab_index = $(".translations ul.ui-tabs-nav .tab-{{ z_language
}}:visible").attr('data-index');
+ if (typeof(tab_index) == 'undefined') {
+ tab_index = $(".translations ul.ui-tabs-nav
li:visible").attr('data-index');
+ }
+ if (typeof(tab_index) != "undefined") {
+ console.log("select" + tab_index)
+ $(".translations").tabs("select", parseInt(tab_index));
+ }
}
);
</script>