FSN#38617 Fallback naar Engelstalig

svn path=/Website/trunk/; revision=31770

APPL/FAC/fac_locale_edit_std.asp

@@ -26,6 +26,7 @@ var authparams = user.checkAutorisation(autfunction);
 
 var submitting = getQParamInt("submit", 0) == 1;
 var lcl_label = getQParam("lcl_label");
+var module = getQParam("module");
 
 maxlen = 2000; // fac_locale_xsl_cust
 %>
@@ -78,19 +79,25 @@ function langlabel(code)
         var talen = talen_arr.join(" UNION ");
         var sql = "SELECT tl.fac_locale_lang"
                 + "     , l.fac_locale_xsl_tekst"
+                + "     , l.fac_locale_xsl_isvalid"
                 + "     , l.fac_locale_xsl_cust"
                 + "  FROM fac_locale_xsl l, ("+talen+") tl"
                 + " WHERE l.fac_locale_xsl_label = " + safe.quoted_sql(lcl_label)
+                + "   AND l.fac_locale_xsl_module = " + safe.quoted_sql(module)
                 + "   AND l.fac_locale_xsl_lang = tl.fac_locale_lang"
                 + " ORDER BY volgorde";
         var oRs = Oracle.Execute(sql);
 
         while (!oRs.eof)
         {
+            var tekst = oRs("fac_locale_xsl_tekst").Value
+            if (oRs("fac_locale_xsl_isvalid").Value == 0)
+                tekst = "<<{0}>>".format(L("lcl_lcl_undefined"));
+
             var fldname = "lcl_cust_"+oRs("fac_locale_lang").Value;
             ROFIELDTR("fldlclstd",
                       langlabel(oRs("fac_locale_lang").Value),
-                      oRs("fac_locale_xsl_tekst").Value, {maxlength: maxlen });
+                      tekst, {maxlength: maxlen });
             RWFIELDTR(fldname, "fldlclstd",
                       /*lcl.languages[oRs("fac_locale_lang").Value]*/"",
                       oRs("fac_locale_xsl_cust").Value, {maxlength: maxlen });

APPL/FAC/fac_locale_list_std.asp

@@ -29,6 +29,7 @@ var vModule = getQParam("sModule", "-1");
 var outputmode = getQParamInt("outputmode", 0);
 var showall = getQParamInt("showall", 0) == 1;
 var overruled = (getQParam("lcl_overrule", "") == "on")
+var lcl_undefined = (getQParam("lcl_undefined", "") == "on")
 var SorteerKolommen = [];
 var vWhere = "";
 
@@ -44,31 +45,41 @@ var vWhere = "";
       }
   }
 
-  sqln = "SELECT l.fac_locale_xsl_label, fac_locale_xsl_module"
+  var sqln = "SELECT l.fac_locale_xsl_label, fac_locale_xsl_module"
            + "     , " + SorteerKolommen.join(',')
            + "     , COUNT(DISTINCT fac_locale_xref_filepath) n_file"
            + "  FROM fac_locale_xsl l,"
            + "       fac_locale_xref x"
-       + " WHERE x.fac_locale_xsl_key(+) = l.fac_locale_xsl_key"
+           + " WHERE x.fac_locale_xsl_key(+) = l.fac_locale_xsl_key";
+
+  var filters = [];
   if (overruled)
+    filters.push("fac_locale_xsl_cust IS NOT NULL");
+
+  if (lcl_undefined)
+    filters.push("fac_locale_xsl_isvalid = 0");
+
+  if (vTaal != "-1")
+    filters.push("fac_locale_xsl_lang = " + safe.quoted_sql(vTaal));
+
+  if (vSearchString != "")
+  {
+    filters.push("(UPPER(fac_locale_xsl_label) LIKE "+safe.quoted_sql_wild("%"+vSearchString+"%") + ") "
+                 +     "OR (UPPER(fac_locale_xsl_tekst) LIKE "+safe.quoted_sql_wild("%"+vSearchString+"%") + ") "
+                 +     "OR (UPPER(fac_locale_xsl_cust)  LIKE "+safe.quoted_sql_wild("%"+vSearchString+"%") + ") "
+                 +     ") "
+                 + ")");
+  }
+
+  if (filters.length)
   {
     sqln +=" AND l.fac_locale_xsl_label IN "
          + "    (SELECT l2.fac_locale_xsl_label "
          + "       FROM fac_locale_xsl l2"
-         + "      WHERE fac_locale_xsl_cust IS NOT NULL"
-         + "     ) ";
-  }
-  if (vSearchString != "")
-  {
-    sqln += " AND (fac_locale_xsl_label) IN "
-         +  "(SELECT fac_locale_xsl_label "
-         +  " FROM fac_locale_xsl "
-         +  " WHERE (  (UPPER(fac_locale_xsl_label) LIKE "+safe.quoted_sql_wild("%"+vSearchString+"%") + ") "
-         +         "OR (UPPER(fac_locale_xsl_tekst) LIKE "+safe.quoted_sql_wild("%"+vSearchString+"%") + ") "
-         +         "OR (UPPER(fac_locale_xsl_cust)  LIKE "+safe.quoted_sql_wild("%"+vSearchString+"%") + ") "
-         +         ") "
+         + "      WHERE " + filters.join(" AND ")
          + "     ) ";
   }
+
   if (vModule != "-1")
   {
     sqln +=" AND (l.fac_locale_xsl_label, l.fac_locale_xsl_module) IN "
@@ -80,6 +91,7 @@ var vWhere = "";
          + "             OR l2.fac_locale_xsl_module = " + safe.quoted_sql_upper(vModule) + ")"
          + "     ) ";
   }
+
   sqln += " GROUP BY fac_locale_xsl_label, fac_locale_xsl_module"
        +  " ORDER BY REPLACE(fac_locale_xsl_label, 'lcl_', ''), fac_locale_xsl_module";
 
@@ -92,9 +104,10 @@ var vWhere = "";
       function localeedit(row)
       {
         $(row).addClass('dirty');
+        var lclData = eval('(' + row.getAttribute("ROWDATA") + ')');
         var lcl_label = row.getAttribute("ROWKEY");
 
-          url = '../fac/fac_locale_edit_std.asp?lcl_label='    + lcl_label;
+        var url = '../fac/fac_locale_edit_std.asp?lcl_label={0}&module={1}'.format(lcl_label, lclData.module);
         FcltMgr.openModalDetail(url, L("lcl_lcl_vertaling"), { callback: FcltMgr.reload } );
       }
     </script>
@@ -103,18 +116,8 @@ var vWhere = "";
   <body id="listbody">
 <%
     function fnrowData(oRs)
-    {return {};
-        var kolomnaam    = oRs("fac_locale_kolomnaam").value;
-        var kolomkeyval  = oRs("fac_locale_kolomkeyval").value;
-        var kolomkeydata = oRs("fac_locale_default").value;
-
-        if (kolomnaam    == null) kolomnaam    = -1;
-        if (kolomkeyval  == null) kolomkeyval  = -1;
-        if (kolomkeydata == null) kolomkeydata = -1;
-
-        var data = {fac_kolomnaam:kolomnaam,
-                    fac_kolomkeyval:kolomkeyval,
-                    fac_kolomkeydata:kolomkeydata};
+    {
+      var data = { module : oRs("fac_locale_xsl_module").Value };
       return JSON.stringify(data);
     }
 

APPL/FAC/fac_locale_search_std.asp

@@ -103,6 +103,7 @@ var authparams = user.checkAutorisation(autfunction);
                 </tr>
             <%
             CHECKBOXTR(L("lcl_lcl_overruled"), "fldlcloverruled", "lcl_overrule", false);
+            CHECKBOXTR(L("lcl_lcl_undefined"), "fldcheck", "lcl_undefined", false);
             %>
               </table>
             </td>

APPL/Localscripts/iface.js

@@ -100,7 +100,7 @@ var iface =
     },
     overrule: function (lcl_name)
     {
-        var url = rooturl + "/appl/fac/fac_locale_edit_std.asp?lcl_label=" + escape(lcl_name);
+        var url = rooturl + "/appl/fac/fac_locale_edit_std.asp?module=ASP&lcl_label=" + escape(lcl_name);
         FcltMgr.openModalDetail(url, L("lcl_lcl_vertaling"), {xheight: 200, width: 600 } );
 
     },
@@ -220,6 +220,32 @@ var iface =
         {
             suggestfield.setValue(callerinfo.prs_key, callerinfo.prs_naam, true, true); // wel checkExist doen!
         }
+    },
+    tabFrames: function () // Maak van alle subframes automatisch interne tabjes
+    {
+        var $frames = $(".fcltframe");
+        if ($frames.length < 2)
+            return;
+        $('body').wrapInner("<div id='frametabs'></div>");
+        var $ul = $("<ul class='frametabs'></ul>");
+        $(".fcltframe").not(".notabframe").each(function ()
+        {
+            $li = $("<li></li>");
+            $li.append("<a href='#{0}'>{1}</a>".format(this.id, this.id));
+            $ul.append($li);
+        });
+        $('#frametabs').prepend($ul);
+        $('#frametabs').tabs({
+                activate: function( event, ui ) {
+                    var div = ui.newPanel;
+                    if (div.length)
+                    {
+                        $("iframe", div).each(function () {
+                            FcltMgr.iframeLoaded(this);
+                        });
+                    }
+                }
+           });
     }
 }
 // params: checkOnly    : [] beperkt array met velden die gecontroleerd moeten worden