Changeset 5266

Timestamp:

Feb 14, 2009, 3:41:41 PM (15 years ago)

Author:

Takanori Suzuki

Message:

[workfloweditor]Ver1.0 Release

Location:

workfloweditorplugin/0.11

Files:

• .settings/org.eclipse.core.resources.prefs (modified) (1 diff)
• setup.py (modified) (1 diff)
• workfloweditor/api.py (modified) (2 diffs)
• workfloweditor/htdocs/js/workfloweditor-locale-ja.js (added)
• workfloweditor/htdocs/js/workfloweditor.js (modified) (7 diffs)
• workfloweditor/templates/workfloweditor_admin.html (modified) (1 diff)
• workfloweditor/templates/workfloweditor_admin_ja.html (modified) (1 diff)
• workfloweditor/workfloweditor_admin.py (modified) (3 diffs)

workfloweditorplugin/0.11/.settings/org.eclipse.core.resources.prefs

@@ -1 @@
-#Mon Feb 09 00:04:30 JST 2009
+#Sat Feb 14 23:25:00 JST 2009
 eclipse.preferences.version=1
 encoding//customworkflow/templates/customworkflow_admin.html=UTF-8
 encoding//customworkflow/templates/customworkflow_admin_ja.html=UTF-8
+encoding//workfloweditor/htdocs/js/workfloweditor-locale-ja.js=UTF-8
 encoding//workfloweditor/htdocs/js/workfloweditor.js=UTF-8
 encoding/<project>=UTF-8

workfloweditorplugin/0.11/setup.py

@@ -6 +6 @@
 setup(
     name = 'WorkflowEditorPlugin',
-    version = '1.0beta',
+    version = '1.0',
     description = "Edit Ticket Workflow",
     url = "http://trac-hacks.org/wiki/WorkflowEditorPlugin",

workfloweditorplugin/0.11/workfloweditor/api.py

@@ -2 +2 @@
 
 from os import environ
-from trac.core import Component
 
-class LocaleUtil(Component):
+class LocaleUtil:
     
     def get_locale(self, req):
-        """Get client locale from the http request.
-        """
+        """Get client locale from the http request."""
         
         locale = None
@@ -14 +12 @@
         if (len(locale_array) > 0):
             locale = locale_array[0].strip()
-            
+        
+        if (len(locale) > 2):
+            locale = locale[0:2];
+        
         return locale

workfloweditorplugin/0.11/workfloweditor/htdocs/js/workfloweditor.js

@@ -2 +2 @@
 if (!workfloweditor) workfloweditor = {};
 
+/**
+ * i18n
+ */
+workfloweditor.Localizer = function() {
+    this.strings = {};
+    this.lang = "";
+    
+    var htmlTag = document.getElementsByTagName("html")[0];
+    this.lang = htmlTag.getAttribute("xml:lang") || htmlTag.getAttribute("lang");
+    
+    // If there isn't the lang attribute, use browser language.
+    if (this.lang == null || this.lang == "") {
+        var currentLanguage;
+        if (navigator.browserLanguage) {
+            currentLanguage = navigator.browserLanguage; 
+        } else if (navigator.language) { 
+            currentLanguage = navigator.language; 
+        } else if (navigator.userLanguage) { 
+            currentLanguage = navigator.userLanguage; 
+        }
+        
+        if (currentLanguage && currentLanguage.length >= 2) {
+            this.lang = currentLanguage.substr(0,2);
+        }
+    }
+    
+    var self = this;
+    this.getLocalizedString = function(str) {
+        if (!workfloweditor.Localizer.strings)
+        {
+            return str;
+        }
+        
+        var message = workfloweditor.Localizer.strings[str];
+        if (!message || message == "") {
+            message = str;
+        }
+        return message;
+    };
+    
+    return this;
+}
+
+workfloweditor.Localizer = new workfloweditor.Localizer();
+_ = workfloweditor.Localizer.getLocalizedString;
+
+/**
+ * Workflow Editor onload action.
+ */
 jQuery(document).ready(function(){
     var context = new workfloweditor.WorkflowContext();
@@ -34 +83 @@
     // The workflow is updated before saving.
     jQuery("#doChanges").click( function() {
-        if (currentTab = "gridTab") {
+        try
+        {
+            if (currentTab == "textTab") {
+                context.updateModelByText("#workflowText");
+                context.refreshGrid();            
+            }
+            
             context.updateModelByGrid("#workflowGrid");
             context.refreshText();
+        }
+        catch(ex)
+        {
+            alert(_("Error: Please fix the workflow text.")
+                  + "\n(error code = " + ex.number + ")");
+            return false;
         }
     });
@@ -50 +111 @@
     this.DEFAULT_OPERATIONS = {
                                ""                  : "",
-                               "set_owner"         : "担当者を設定",
-                               "del_owner"         : "担当者を削除",
-                               "set_owner_to_self" : "自分を担当者に設定",
-                               "set_resolution"    : "解決方法を設定",
-                               "del_resolution"    : "解決方法を削除",
-                               "leave_status"      : "ステータス表示のみ"
+                               "set_owner"         : _("set owner"),
+                               "del_owner"         : _("del owner"),
+                               "set_owner_to_self" : _("set owner to self"),
+                               "set_resolution"    : _("set resolution"),
+                               "del_resolution"    : _("del resolution"),
+                               "leave_status"      : _("leave status")
                               };
     this.DEFAULT_PERMISSIONS = {
@@ -362 +423 @@
                 );
             } else {
-                alert("行を選択してください");
+                alert(_("Please select row."));
             }
         });
@@ -381 +442 @@
                 );
             } else {
-                alert("行を選択してください");
+                alert(_("Please select row."));
             }
         });
@@ -394 +455 @@
  */
 workfloweditor.WorkflowContext.prototype.createGridColNames = function() {
-    var colNames = ['操作', '表示名', '処理', '権限', '順序', '次のステータス', ''];
+    var colNames = [_('action'), _('name'), _('operation'), _('permission'), _('order'), _('next status'), ''];
     colNames = colNames.concat(this.status);
     
@@ -531 +592 @@
         height      : 0,
         width       : 0,
-        colNames    : ["ステータス"],
+        colNames    : [_("status")],
         colModel    : [{
                         name:'editableStatus', index:'status', width:100, editable:true,

workfloweditorplugin/0.11/workfloweditor/templates/workfloweditor_admin.html

@@ -18 +18 @@
   <fieldset>
     <legend>Workflow Configuration</legend>
-    <div class="field">
-      <textarea name="workflow_config" rows="25" cols="100" wrap="off">${template.workflow_config}</textarea>
-      <br />
-      <br />
-      <div>How to set the workflow: <a href="${href.wiki('TracWorkflow')}">TracWorkflow</a></div>
+    <br />
+    <div id="workflowTabs" style="display:none;">
+      <ul>
+        <li><a href="#gridTab"><span>Grid</span></a></li>
+        <li><a href="#textTab"><span>Text</span></a></li>
+      </ul>
+      <div id="gridTab">
+        <table id="workflowStatusGrid" class="scroll" cellpadding="0" cellspacing="0"></table>
+        <table id="workflowGrid" class="scroll" cellpadding="0" cellspacing="0"></table>
+        <br />
+        <ul>
+          <li>If you edit the action, please click 'Add', 'Change' or 'Delete' button.</li>
+          <li>If you edit the status, please click 'Edit status' button.</li>
+        </ul>
+        <input type="button" id="workflowGridItemAdd" value="Add" />
+        <input type="button" id="workflowGridItemMod" value="Change" />
+        <input type="button" id="workflowGridItemDel" value="Delete" />
+        &nbsp;&nbsp;&nbsp;&nbsp;
+        <input type="button" id="workflowStatusGridItemMod" value="Edit status" />
+      </div>
+      <div id="textTab">
+        <textarea id="workflowText" name="workflow_config" rows="20" cols="100" wrap="off">${template.workflow_config}</textarea>
+      </div>
     </div>
+    <br />
+    <div>How to set the workflow: <a href="${href.wiki('TracWorkflow')}">TracWorkflow</a></div>
   </fieldset>
+
   <div class="buttons">
-    <input type="submit" value="Apply changes" />
+    <input id="doChanges" type="submit" value="Apply changes" />
   </div>
 </form>

workfloweditorplugin/0.11/workfloweditor/templates/workfloweditor_admin_ja.html

@@ -28 +28 @@
         <table id="workflowGrid" class="scroll" cellpadding="0" cellspacing="0"></table>
         <br />
+        <ul>
+          <li>操作を編集する場合は、「追加」「変更」「削除」ボタンをしてください。</li>
+          <li>ステータスを編集する場合は、「ステータスの編集」ボタンを押下してください。</li>
+        </ul>
         <input type="button" id="workflowGridItemAdd" value="追加" />
         <input type="button" id="workflowGridItemMod" value="変更" />

workfloweditorplugin/0.11/workfloweditor/workfloweditor_admin.py

@@ -30 +30 @@
         if req.perm.has_permission('TRAC_ADMIN'):
             # localization
-            locale = LocaleUtil(self.env).get_locale(req)
-            if locale in ['ja', 'ja-JP']:
+            locale = LocaleUtil().get_locale(req)
+            if (locale == 'ja'):
                 yield ('ticket', u'チケットシステム', 'workfloweditor', u'ワークフロー')
             else:
@@ -58 +58 @@
         
         # localization
-        locale = LocaleUtil(self.env).get_locale(req)
-        if locale in ['ja', 'ja-JP']:
+        locale = LocaleUtil().get_locale(req)
+        if (locale == 'ja'):
+            add_script(req, 'workfloweditor/js/workfloweditor-locale-ja.js')
             page_template = 'workfloweditor_admin_ja.html'
         else:
@@ -107 +108 @@
         
         # localization
-        locale = LocaleUtil(self.env).get_locale(req)
-        if locale in ['ja', 'ja-JP']:
+        locale = LocaleUtil().get_locale(req)
+        if (locale == 'ja'):
             init_file = 'trac_jp.ini'
         else: