diff --git a/inc/themes/material-blue/account.inc b/inc/themes/material-blue/account.inc index be08be8b..172f9c1e 100644 --- a/inc/themes/material-blue/account.inc +++ b/inc/themes/material-blue/account.inc @@ -8,7 +8,7 @@ -
+ @@ -206,15 +206,15 @@ - - - - - - - - - + + + + + + + + + @@ -354,7 +354,7 @@ - + @@ -366,55 +366,55 @@
- - - - - - - - + + + + + + - - - - - - - diff --git a/inc/themes/material-blue/categories.inc b/inc/themes/material-blue/categories.inc index 2de742d6..940203b1 100644 --- a/inc/themes/material-blue/categories.inc +++ b/inc/themes/material-blue/categories.inc @@ -1,7 +1,7 @@

- +
@@ -39,8 +39,8 @@
-
diff --git a/inc/themes/material-blue/css/styles.css b/inc/themes/material-blue/css/styles.css index aa7a8e31..6c57c9e7 100644 --- a/inc/themes/material-blue/css/styles.css +++ b/inc/themes/material-blue/css/styles.css @@ -155,32 +155,17 @@ i{cursor: pointer;} font-weight: bold; } -a { +a, a:visited { text-decoration: none; - color: #339; + color: rgba(68, 138, 255, 1); } -a:visited { +a:hover, a:active, a:focus { text-decoration: none; - color: #339; -} - -a:hover { - text-decoration: none; - color: orangered; + color: rgba(68, 138, 255, .6); cursor: pointer; } -a:active { - text-decoration: none; - color: #BB0000; -} - -a:focus { - text-decoration: none; - color: #FF0000; -} - #nojs { width: 80%; margin: auto; diff --git a/inc/themes/material-blue/customers.inc b/inc/themes/material-blue/customers.inc index 957751b5..fe297876 100644 --- a/inc/themes/material-blue/customers.inc +++ b/inc/themes/material-blue/customers.inc @@ -1,7 +1,7 @@

-
+
@@ -39,8 +39,8 @@
-
diff --git a/inc/themes/material-blue/editpass.inc b/inc/themes/material-blue/editpass.inc index 99796a1a..c1022b94 100644 --- a/inc/themes/material-blue/editpass.inc +++ b/inc/themes/material-blue/editpass.inc @@ -3,7 +3,7 @@ - +
@@ -39,7 +39,7 @@
+ maxlength="255" autocomplete="off">
@@ -51,21 +51,22 @@ + +
+ + + +
-
- - - -
- - - \ No newline at end of file +
+
+
+ +  ::  + cygnux.org +
+ + + + + \ No newline at end of file diff --git a/inc/themes/material-blue/groups.inc b/inc/themes/material-blue/groups.inc index 118e7942..267d279c 100644 --- a/inc/themes/material-blue/groups.inc +++ b/inc/themes/material-blue/groups.inc @@ -1,7 +1,7 @@

-
+ @@ -39,8 +39,8 @@
-
diff --git a/inc/themes/material-blue/imgs/logo.png b/inc/themes/material-blue/imgs/logo.png index 4e21a7a8..765a1908 100644 Binary files a/inc/themes/material-blue/imgs/logo.png and b/inc/themes/material-blue/imgs/logo.png differ diff --git a/inc/themes/material-blue/imgs/logo_full.png b/inc/themes/material-blue/imgs/logo_full.png index 1c16ccae..bb6476b3 100644 Binary files a/inc/themes/material-blue/imgs/logo_full.png and b/inc/themes/material-blue/imgs/logo_full.png differ diff --git a/inc/themes/material-blue/js/functions.js b/inc/themes/material-blue/js/functions.js index 9da02d3f..f43c12ae 100644 --- a/inc/themes/material-blue/js/functions.js +++ b/inc/themes/material-blue/js/functions.js @@ -36,9 +36,13 @@ jQuery.extend(jQuery.fancybox.defaults, { type: 'ajax', autoWidth: 'true', autoHeight: 'true', + autoResize: 'true', + autoCenter: 'true', + fitToView: 'true', minHeight: 50, padding: 0, helpers: {overlay: {css: {'background': 'rgba(0, 0, 0, 0.1)'}}}, + keys: {close: [27]}, afterShow: function () { "use strict"; @@ -473,12 +477,8 @@ function saveAccount(frm) { var data = $("#" + frm).serialize(); var id = $('input[name="accountid"]').val(); - var savetyp = $('input[name="savetyp"]').val(); var action = $('input[name="next"]').val(); - $('#btnGuardar').attr('disabled', true); - $.fancybox.showLoading(); - $.ajax({ type: 'POST', dataType: 'json', @@ -491,20 +491,13 @@ function saveAccount(frm) { if (status === 0) { resMsg("ok", description); - if (savetyp === 1) { - $('#btnSave').hide(); - } else { - $('#btnSave').attr('disabled', true); - } - if (action && id) { - doAction(action, 'accsearch', id); + doAction(action, 1, id); } } else if (status === 10) { doLogout(); } else { resMsg("error", description); - $('#btnSave').removeAttr("disabled"); } }, error: function (jqXHR, textStatus, errorThrown) { @@ -512,7 +505,6 @@ function saveAccount(frm) { resMsg("error", txt); }, complete: function () { - $.fancybox.hideLoading(); } }); } @@ -1159,12 +1151,6 @@ function resMsg(type, txt, url, action) { return alertify.error(txt); } - jQuery('#dialog').load(html).dialog('open').afterClose(function () { - if (typeof action !== "undefined") { - eval(action); - } - }); - /* $.fancybox(html, { afterLoad: function () { $('.fancybox-skin,.fancybox-outer,.fancybox-inner').css({ diff --git a/inc/themes/material-blue/js/js.php b/inc/themes/material-blue/js/js.php index 320126cc..da0cd380 100644 --- a/inc/themes/material-blue/js/js.php +++ b/inc/themes/material-blue/js/js.php @@ -24,7 +24,7 @@ */ $jsFilesTheme = array( - array('href' => \SP\Init::$THEMEPATH . '/js/functions.js', 'min' => true), // array('href' => \SP\Init::$THEMEPATH . '/js/material.min.js.map', 'min' => false), array('href' => \SP\Init::$THEMEPATH . '/js/material.min.js', 'min' => false), + array('href' => \SP\Init::$THEMEPATH . '/js/functions.js', 'min' => true), ); \ No newline at end of file diff --git a/inc/themes/material-blue/login.inc b/inc/themes/material-blue/login.inc index b6327119..e1acbc4d 100644 --- a/inc/themes/material-blue/login.inc +++ b/inc/themes/material-blue/login.inc @@ -62,7 +62,7 @@
-
@@ -104,8 +104,6 @@ \ No newline at end of file diff --git a/web/SearchC.class.php b/web/SearchC.class.php index d8e3b48e..a5d5c038 100644 --- a/web/SearchC.class.php +++ b/web/SearchC.class.php @@ -154,20 +154,23 @@ class SearchC extends Controller implements ActionsInterface } $colors = array( - 'ef5350', - 'ec407a', - 'ab47bc', - '7e57c2', - '5c6bc0', - '42a5f5', - '29b6f6', - '26c6da', - '26a69a', - '66bb6a', - '9ccc65', - 'ff7043', - '8d6e63', - '78909c' + '2196F3', + '03A9F4', + '00BCD4', + '009688', + '4CAF50', + '8BC34A', + 'CDDC39', + 'FFC107', + '795548', + '607D8B', + '9E9E9E', + 'FF5722', + 'F44336', + 'E91E63', + '9C27B0', + '673AB7', + '3F51B5', ); $this->setSortFields();