Changeset 5959 for extensions/AMetaData/admin

Timestamp:

Apr 25, 2010, 1:22:40 AM (15 years ago)

Author:

grum

Message:

Some changes on release 0.4b

Location:

extensions/AMetaData/admin

Files:

• amd_help.tpl (modified) (1 diff)
• amd_metadata_database.tpl (modified) (7 diffs)
• amd_metadata_display.tpl (modified) (1 diff)
• amd_metadata_select.tpl (modified) (1 diff)

extensions/AMetaData/admin/amd_help.tpl

@@ -1 +1 @@
 {$statTabsheet}
 
-<h3>{'g003_metadata'|@translate}&nbsp;{$data.title}</h3>
+<h2>{'g003_metadata'|@translate}&nbsp;{$data.title}</h2>
 
 <div id="helpBody">

extensions/AMetaData/admin/amd_metadata_database.tpl

@@ -1 +1 @@
 {known_script id="jquery.ui" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.core.packed.js"}
-{known_script id="jquery.ui.slider" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.slider.packed.js"}
 {known_script id="jquery.ui.dialog" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.dialog.packed.js"}
-
 
 {literal}
 <script type="text/javascript">
+var processAnalyze = {
+      step:0,
+      lists:new Array(),
+      timeStart:0,
+      timeEnd:0
+    }
 
   function init()
@@ -45 +49 @@
   function doAnalyze()
   {
-    $("body").css("cursor", "wait");
-
     mode="all";
     modeLabel="";
@@ -72 +74 @@
 
 
-    doAnalyze="<br><form id='iDialogProgress' class='formtable'>"+
+    doAnalyzeDialog="<br><form id='iDialogProgress' class='formtable'>"+
       "<div id='iprogressbar_contener' class='gcBorderInput'>"+
       "<span id='iprogressbar_bg' class='gcBgInput' style='width:0%;'>&nbsp;</span>"+
@@ -92 +94 @@
         title: '{/literal}{"g003_updating_metadata"|@translate}{literal}&nbsp;('+modeLabel+')',
       }
-    ).html(doAnalyze);
+    ).html(doAnalyzeDialog);
 
     NumberOfItemsPerRequest=$("#iamd_NumberOfItemsPerRequest").val();
@@ -100 +102 @@
         type: "POST",
         url: "{/literal}{$datas.urlRequest}{literal}",
-        async: false,
+        async: true,
         data: { ajaxfct:"makeStatsGetList", selectMode:mode, numOfItems:NumberOfItemsPerRequest },
         success: function(msg)
           {
-            doStep_getList(msg);
+            processAnalyze.step=0;
+            processAnalyze.lists=msg.split(";");
+            processAnalyze.timeStart=new Date();
+            doStep_processList();
           },
         error: function()
@@ -124 +129 @@
   }
 
-  function doStep_getList(data)
-  {
-    timeStart = new Date();
-    list=data.split(";");
-    for(i=0;i<list.length-1;i++)
+  function doStep_processList()
+  {
+    if(processAnalyze.step < processAnalyze.lists.length)
     {
       tmp = $.ajax({
         type: "POST",
         url: "{/literal}{$datas.urlRequest}{literal}",
-        async: false,
-        data: { ajaxfct:"makeStatsDoAnalyze", imagesList:list[i] }
-       }).responseText;
-
-      pct=100*(i+1)/list.length;
+        async: true,
+        data: { ajaxfct:"makeStatsDoAnalyze", imagesList:processAnalyze.lists[processAnalyze.step] },
+        success: function(msg)
+          {
+            processAnalyze.step++;
+            doStep_processList();
+          },
+       });
+
+      pct=100*(processAnalyze.step+1)/processAnalyze.lists.length;
       $("#iprogressbar_bg").css("width", pct+"%");
       $("#iprogressbar_fg").html(Math.round(pct)+"%");
     }
-
-    tmp = $.ajax({
-      type: "POST",
-      url: "{/literal}{$datas.urlRequest}{literal}",
-      async: false,
-      data: { ajaxfct:"makeStatsConsolidation" }
-     }).responseText;
-
-
-    timeEnd = new Date();
-    timeElapsed=timeEnd.getTime()-timeStart.getTime();
-
-
-    $("#dialog")
-    .dialog("destroy")
-    .html("")
-    .get(0).removeAttribute('style');
-
-    $("#dialog")
-    .dialog(
-      {
-        resizable: false,
-        width:480,
-        height:120,
-        modal: true,
-        draggable:true,
-        dialogClass: 'gcBgTabSheet gcBorder',
-        title: '{/literal}{"g003_updating_metadata"|@translate}{literal}',
-        dialogClass: 'gcBgTabSheet gcBorder',
-        open: function(event, ui)
+    else
+    {
+      // list completely processed
+
+      tmp = $.ajax({
+        type: "POST",
+        url: "{/literal}{$datas.urlRequest}{literal}",
+        async: false,
+        data: { ajaxfct:"makeStatsConsolidation" }
+       }).responseText;
+
+
+      processAnalyze.timeEnd = new Date();
+      timeElapsed=processAnalyze.timeEnd.getTime()-processAnalyze.timeStart.getTime();
+
+
+      $("#dialog")
+      .dialog("destroy")
+      .html("")
+      .get(0).removeAttribute('style');
+
+      $("#dialog")
+      .dialog(
         {
-          bH=$("div.ui-dialog-buttonpane").get(0).clientHeight;
-          $("#dialog").css('height', (this.clientHeight-bH)+"px");
-        },
-        buttons:
-        {
-          '{/literal}{"g003_ok"|@translate}{literal}':
-            function()
-            {
-              $(this).dialog('destroy').html("").get(0).removeAttribute('style');
-            }
+          resizable: false,
+          width:480,
+          height:120,
+          modal: true,
+          draggable:true,
+          dialogClass: 'gcBgTabSheet gcBorder',
+          title: '{/literal}{"g003_updating_metadata"|@translate}{literal}',
+          dialogClass: 'gcBgTabSheet gcBorder',
+          open: function(event, ui)
+          {
+            bH=$("div.ui-dialog-buttonpane").get(0).clientHeight;
+            $("#dialog").css('height', (this.clientHeight-bH)+"px");
+          },
+          buttons:
+          {
+            '{/literal}{"g003_ok"|@translate}{literal}':
+              function()
+              {
+                $(this).dialog('destroy').html("").get(0).removeAttribute('style');
+              }
+          }
         }
-      }
-    )
-    .html("<br>{/literal}{'g003_analyze_is_finished'|@translate}{literal}&nbsp;("+displayTime(timeElapsed/1000)+")");
-
-    getStatus();
-    $("body").css("cursor", "default");
+      )
+      .html("<br>{/literal}{'g003_analyze_is_finished'|@translate}{literal}&nbsp;("+displayTime(timeElapsed/1000)+")");
+
+      getStatus();
+    }
   }
 
@@ -196 +207 @@
 {/literal}
 
-<h3>{'g003_status_of_database'|@translate}</h3>
+<h2>{'g003_status_of_database'|@translate}</h2>
 
 <div id="dialog"></div>

extensions/AMetaData/admin/amd_metadata_display.tpl

@@ -359 +359 @@
 
 
-<h3>{'g003_display_management'|@translate}</h3>
+<h2>{'g003_display_management'|@translate}</h2>
 
 <div class="addGroup">

extensions/AMetaData/admin/amd_metadata_select.tpl

@@ -202 +202 @@
 
 
-<h3>{'g003_select_metadata'|@translate}</h3>
+<h2>{'g003_select_metadata'|@translate}</h2>
 
 <form>