[open-ils-commits] r9374 - in trunk/Open-ILS/web/conify/global: . actor permission

[svn at svn.open-ils.org]

Author: miker
Date: 2008-04-17 15:21:56 -0400 (Thu, 17 Apr 2008)
New Revision: 9374

Added:
   trunk/Open-ILS/web/conify/global/admin.js
Modified:
   trunk/Open-ILS/web/conify/global/actor/org_unit.html
   trunk/Open-ILS/web/conify/global/actor/org_unit_type.html
   trunk/Open-ILS/web/conify/global/permission/grp_tree.html
   trunk/Open-ILS/web/conify/global/permission/grp_tree.js
Log:
move locale parsing out to a separate javascript file; translations of group names and descriptions

Modified: trunk/Open-ILS/web/conify/global/actor/org_unit.html
===================================================================
--- trunk/Open-ILS/web/conify/global/actor/org_unit.html	2008-04-17 18:54:50 UTC (rev 9373)
+++ trunk/Open-ILS/web/conify/global/actor/org_unit.html	2008-04-17 19:21:56 UTC (rev 9374)
@@ -51,15 +51,8 @@
 		<script language='javascript' src='/opac/common/js/fmall.js' type='text/javascript'></script>
 
 		<!-- Dojo goodness -->
-		<script type="text/javascript">
-			var djConfig = { parseOnLoad : true };
+		<script type="text/javascript" src="../admin.js"></script>
 
-			var _url_locale = location.href.replace(/^.*conify\/(.+)\/global.*$/, "$1").toLowerCase().replace(/-/,'_');
-			if (_url_locale) djConfig.locale = _url_locale;
-			else djConfig.locale = '<!--#echo var="locale"-->';
-
-		</script>
-
 		<script type="text/javascript" src="/js/dojo/dojo/dojo.js"></script>
 		<script type="text/javascript" src="/js/dojo/dijit/dijit.js"></script>
 

Modified: trunk/Open-ILS/web/conify/global/actor/org_unit_type.html
===================================================================
--- trunk/Open-ILS/web/conify/global/actor/org_unit_type.html	2008-04-17 18:54:50 UTC (rev 9373)
+++ trunk/Open-ILS/web/conify/global/actor/org_unit_type.html	2008-04-17 19:21:56 UTC (rev 9374)
@@ -51,15 +51,7 @@
 		<script language='javascript' src='/opac/common/js/fmall.js' type='text/javascript'></script>
 
 		<!-- Dojo goodness -->
-		<script type="text/javascript">
-			var djConfig = { parseOnLoad : true };
-
-			var _url_locale = location.href.replace(/^.*conify\/(.+)\/global.*$/, "$1").toLowerCase().replace(/-/,'_');
-			if (_url_locale) djConfig.locale = _url_locale;
-			else djConfig.locale = '<!--#echo var="locale"-->';
-
-		</script>
-
+		<script type="text/javascript" src="../admin.js"></script>
 		<script type="text/javascript" src="/js/dojo/dojo/dojo.js"</script>
 		<script type="text/javascript" src="/js/dojo/dijit/dijit.js"></script>
 

Added: trunk/Open-ILS/web/conify/global/admin.js
===================================================================
--- trunk/Open-ILS/web/conify/global/admin.js	                        (rev 0)
+++ trunk/Open-ILS/web/conify/global/admin.js	2008-04-17 19:21:56 UTC (rev 9374)
@@ -0,0 +1,6 @@
+var djConfig = { parseOnLoad : true };
+
+var _url_locale = location.href.replace(/^.*conify\/(.+)\/global.*$/, "$1").toLowerCase().replace(/-/,'_');
+if (_url_locale) djConfig.locale = _url_locale;
+else djConfig.locale = '<!--#echo var="locale"-->';
+

Modified: trunk/Open-ILS/web/conify/global/permission/grp_tree.html
===================================================================
--- trunk/Open-ILS/web/conify/global/permission/grp_tree.html	2008-04-17 18:54:50 UTC (rev 9373)
+++ trunk/Open-ILS/web/conify/global/permission/grp_tree.html	2008-04-17 19:21:56 UTC (rev 9374)
@@ -64,7 +64,8 @@
 		<script language='javascript' src='/opac/common/js/fmall.js' type='text/javascript'></script>
 
 		<!-- Dojo goodness -->
-		<script type="text/javascript" src="/js/dojo/dojo/dojo.js" djConfig="parseOnLoad: true"></script>
+		<script type="text/javascript" src="../admin.js"></script>
+		<script type="text/javascript" src="/js/dojo/dojo/dojo.js"></script>
 		<script type="text/javascript" src="/js/dojo/dijit/dijit.js"></script>
 
 		<script type="text/javascript" src="grp_tree.js"></script>
@@ -190,6 +191,7 @@
 						right_pane_toggler.show();
 
 						current_group = item;
+						window.current_fm_group = new pgt().fromStoreItem(item);
 
 						perm_map_model.query = { grp : current_group ? current_group.id[0] : -1 };
 						perm_map_model.refresh();
@@ -267,17 +269,21 @@
 											}
 										</script>
 									</span>
+									<span dojoType="openils.I18N.translationWidget" targetObject="current_fm_group" field="name"></span>
 								</td>
 							</tr>
 							<tr>
 								<th>Description</th>
 								<td>
-									<textarea
-									  id="editor_pane_description"
-									  dojoType="dijit.form.Textarea"
-									  jsId="editor_pane_description"
-									  onChange="if (current_group) group_store.setValue( current_group, "description", this.getValue() );"
-									></textarea>
+									<span>
+										<textarea
+										  id="editor_pane_description"
+										  dojoType="dijit.form.Textarea"
+										  jsId="editor_pane_description"
+										  onChange="if (current_group) group_store.setValue( current_group, "description", this.getValue() );"
+										></textarea>
+									</span>
+									<span dojoType="openils.I18N.translationWidget" targetObject="current_fm_group" field="description"></span>
 								</td>
 							</tr>
 							<tr>

Modified: trunk/Open-ILS/web/conify/global/permission/grp_tree.js
===================================================================
--- trunk/Open-ILS/web/conify/global/permission/grp_tree.js	2008-04-17 18:54:50 UTC (rev 9373)
+++ trunk/Open-ILS/web/conify/global/permission/grp_tree.js	2008-04-17 19:21:56 UTC (rev 9374)
@@ -16,6 +16,7 @@
 */
 
 dojo.require('fieldmapper.dojoData');
+dojo.require('openils.I18N');
 dojo.require('dojo.parser');
 dojo.require('dojo.data.ItemFileWriteStore');
 dojo.require('dojo.date.stamp');