[dev] [commit] r1060 - templates/admin wwwbase/js wwwbase/styles

[automailer at dexonline.ro]

Author: cata
Date: Tue Jan 14 18:54:51 2014
New Revision: 1060

Log:
Fix error messages on the lexem edit page (they were invisibile because
of the absolute positioning of the jQuery window manager).
Will need more work to distinguish between infos / warnings / errors.

Added:
   templates/admin/flashMessages.ihtml
Modified:
   templates/admin/pageLayout.ihtml
   wwwbase/js/flex.js
   wwwbase/js/jquery-wm.js
   wwwbase/styles/flex.css

Added: templates/admin/flashMessages.ihtml
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ templates/admin/flashMessages.ihtml	Tue Jan 14 18:54:51 2014	(r1060)
@@ -0,0 +1,5 @@
+{if isset($GLOBALS.flashMessage)}
+  <div id="flashMessage" hidden>
+    {$GLOBALS.flashMessage}
+  </div>
+{/if}

Modified: templates/admin/pageLayout.ihtml
==============================================================================
--- templates/admin/pageLayout.ihtml	Tue Jan 14 17:54:36 2014	(r1059)
+++ templates/admin/pageLayout.ihtml	Tue Jan 14 18:54:51 2014	(r1060)
@@ -13,7 +13,7 @@
       {include file="admin/header.ihtml" title=$sectionTitle count=$sectionCount showSources=$sectionSources}
     {/if}
     {include file="admin/recentlyVisited.ihtml"}
-    {include file="common/flashMessages.ihtml"}
+    {include file="admin/flashMessages.ihtml"}
     {include file="common/errorMessage.ihtml"}
     {include file="$templateName"}
     {include file="common/bits/debugInfo.ihtml"}

Modified: wwwbase/js/flex.js
==============================================================================
--- wwwbase/js/flex.js	Tue Jan 14 17:54:36 2014	(r1059)
+++ wwwbase/js/flex.js	Tue Jan 14 18:54:51 2014	(r1060)
@@ -1,3 +1,17 @@
+// If there are error messages, show them in a dialog
+$(function() {
+  $('#flashMessage').dialog({
+    buttons: {
+      Ok: function() {
+        $(this).dialog('close');
+      }
+    },
+    modal: true,
+    title: 'Eroare',
+    width: 500,
+  });
+});
+
 function updateModelTypeList() {
   var locVersion = $('#locVersionListId').val();
   var url = wwwRoot + 'ajax/getModelTypesForLocVersion.php?locVersion=' + locVersion;

Modified: wwwbase/js/jquery-wm.js
==============================================================================
--- wwwbase/js/jquery-wm.js	Tue Jan 14 17:54:36 2014	(r1059)
+++ wwwbase/js/jquery-wm.js	Tue Jan 14 18:54:51 2014	(r1060)
@@ -5,7 +5,7 @@
  * modified by cata -- do not replace without diffing
  */
 (function($){
-  var $win,lastMouseX,lastMouseY,zIndex=100000,minH,minW=160,newWinOffset=50;
+  var $win,lastMouseX,lastMouseY,zIndex=10,minH,minW=160,newWinOffset=50;
 
   var isIE = navigator.userAgent.match(/MSIE/);
 

Modified: wwwbase/styles/flex.css
==============================================================================
--- wwwbase/styles/flex.css	Tue Jan 14 17:54:36 2014	(r1059)
+++ wwwbase/styles/flex.css	Tue Jan 14 18:54:51 2014	(r1060)
@@ -332,15 +332,6 @@
   letter-spacing: 3px;
 }
 
-div.flashMessage {
-  font-weight: bold;
-  margin: 10px auto;
-  padding: 10px 10px 10px 40px;
-  width: 40em;
-  -moz-border-radius: 7px;
-  -webkit-border-radius: 7px;
-}
-
 div.errorType {
   background: url("../img/icons/exclamation.png") no-repeat 10px center;
   border: 2px solid #eea77e;
@@ -375,3 +366,12 @@
 .ui-widget-header .ui-icon {
 	background-image: url("lightness-1.10.3/images/ui-icons_222222_256x240.png");
 }
+
+/* Minor jQueryUI dialog adjustments */
+.ui-dialog {
+  font-size: 90%;
+}
+
+.ui-dialog .ui-dialog-buttonpane {
+  padding: 0;
+}