diff --git a/webnotes/core/page/applications/applications.js b/webnotes/core/page/applications/applications.js index 41d991d1ae..adb0b7660e 100644 --- a/webnotes/core/page/applications/applications.js +++ b/webnotes/core/page/applications/applications.js @@ -52,7 +52,7 @@ wn.pages['applications'].onload = function(wrapper) { if(!r.exc) { msgprint(" Installed"); msgprint("Refreshing..."); - setTimeout(window.location.reload, 2000) + setTimeout(function() { window.location.reload() }, 2000) } } }) diff --git a/webnotes/core/page/desktop/desktop.css b/webnotes/core/page/desktop/desktop.css index c944dcfa51..161ef81bfe 100644 --- a/webnotes/core/page/desktop/desktop.css +++ b/webnotes/core/page/desktop/desktop.css @@ -1,23 +1,23 @@ -.case-border { - border-radius: 5px; - padding: 20px; - display: inline-block; -/* box-shadow: 0 0 4px 1px black; - -moz-box-shadow: 0 0 4px 1px black; - -webkit-box-shadow: 0 0 4px 1px black; - -o-box-shadow: 0 0 4px 1px black; -*/ margin: auto; - text-align: center; +#icon-grid { + padding-bottom: 30px; } .case-wrapper { position: relative; - margin: 24px; + margin: 12px; float: left; width: 100px; height: 100px; } +.case-border { + border-radius: 5px; + padding: 20px; + display: inline-block; + margin: auto; + text-align: center; +} + .case-wrapper i { font-size: 32px; min-width: 32px; @@ -27,11 +27,30 @@ .case-label { color: white; - padding-top: 10px; + padding-top: 5px; text-align: center; text-shadow: 0px 0px 10px rgba(0, 0, 0, 0.6); } + +@media (max-width: 768px) { + .case-wrapper { + margin: 12px; + width: 70px; + height: 80px; + } + .case-border { + padding: 12px; + } + .case-label { + padding-top: 2px; + font-size: 85%; + } +} + + + + /* Hover and click effects */ .case-border:hover, .hover-effect { -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.2); diff --git a/webnotes/core/page/messages/messages.js b/webnotes/core/page/messages/messages.js index 3ac9ef4e39..3253e74baf 100644 --- a/webnotes/core/page/messages/messages.js +++ b/webnotes/core/page/messages/messages.js @@ -47,7 +47,7 @@ wn.core.pages.messages = Class.extend({ var txt = $('#post-message textarea').val(); if(txt) { return wn.call({ - module:'core', + module: 'webnotes.core', page:'messages', method:'post', args: { @@ -159,7 +159,7 @@ wn.core.pages.messages = Class.extend({ show_active_users: function() { var me = this; return wn.call({ - module:'core', + module:'webnotes.core', page:'messages', method:'get_active_users', callback: function(r,rt) { diff --git a/webnotes/core/page/permission_manager/permission_manager.js b/webnotes/core/page/permission_manager/permission_manager.js index 0e3c7c2458..d1575c5097 100644 --- a/webnotes/core/page/permission_manager/permission_manager.js +++ b/webnotes/core/page/permission_manager/permission_manager.js @@ -70,7 +70,7 @@ wn.PermissionEngine = Class.extend({ me.make_reset_button(); return wn.call({ - module:"core", + module:"webnotes.core", page:"permission_manager", method: "get_roles_and_doctypes", callback: function(r) { @@ -116,7 +116,7 @@ wn.PermissionEngine = Class.extend({ var doctype = this.doctype_select.val(); if(doctype) { wn.call({ - module:"core", + module:"webnotes.core", page:"permission_manager", method: "get_standard_permissions", args: {doctype: doctype}, @@ -132,7 +132,7 @@ wn.PermissionEngine = Class.extend({ me.reset_button = me.wrapper.appframe.set_title_right("Reset Permissions", function() { if(wn.confirm("Reset Permissions for " + me.get_doctype() + "?", function() { return wn.call({ - module:"core", + module:"webnotes.core", page:"permission_manager", method:"reset", args: { @@ -163,7 +163,7 @@ wn.PermissionEngine = Class.extend({ } // get permissions wn.call({ - module: "core", + module: "webnotes.core", page: "permission_manager", method: "get_permissions", args: { @@ -265,7 +265,7 @@ wn.PermissionEngine = Class.extend({ .click(function() { var role = $(this).attr("data-role"); wn.call({ - module: "core", + module: "webnotes.core", page: "permission_manager", method: "get_users_with_role", args: { @@ -305,7 +305,7 @@ wn.PermissionEngine = Class.extend({ .attr("data-doctype", d.parent) .click(function() { return wn.call({ - module: "core", + module: "webnotes.core", page: "permission_manager", method: "remove", args: { @@ -333,7 +333,7 @@ wn.PermissionEngine = Class.extend({ value: chk.prop("checked") ? 1 : 0 } return wn.call({ - module: "core", + module: "webnotes.core", page: "permission_manager", method: "update", args: args, @@ -381,7 +381,7 @@ wn.PermissionEngine = Class.extend({ return; } wn.call({ - module: "core", + module: "webnotes.core", page: "permission_manager", method: "add", args: args, @@ -425,7 +425,7 @@ wn.PermissionEngine = Class.extend({ var match_value = $(dialog.wrapper).find(":radio:checked").val(); var perm = me.get_perm($(this).attr('data-name')) return wn.call({ - module: "core", + module: "webnotes.core", page: "permission_manager", method: "update_match", args: { diff --git a/webnotes/core/page/user_properties/user_properties.js b/webnotes/core/page/user_properties/user_properties.js index 6aaa7a2ef8..9cc0336e61 100644 --- a/webnotes/core/page/user_properties/user_properties.js +++ b/webnotes/core/page/user_properties/user_properties.js @@ -35,7 +35,7 @@ wn.UserProperties = Class.extend({ make: function() { var me = this; return wn.call({ - module:"core", + module:"webnotes.core", page:"user_properties", method: "get_users_and_links", callback: function(r) { @@ -130,7 +130,7 @@ wn.UserProperties = Class.extend({ } // get permissions return wn.call({ - module: "core", + module: "webnotes.core", page: "user_properties", method: "get_properties", args: { @@ -179,7 +179,7 @@ wn.UserProperties = Class.extend({ .attr("data-defvalue", d.defvalue) .click(function() { return wn.call({ - module: "core", + module: "webnotes.core", page: "user_properties", method: "remove", args: { @@ -241,7 +241,7 @@ wn.UserProperties = Class.extend({ return; } wn.call({ - module: "core", + module: "webnotes.core", page: "user_properties", method: "add", args: args, diff --git a/webnotes/installer.py b/webnotes/installer.py index 2396bfa240..90326ba11e 100755 --- a/webnotes/installer.py +++ b/webnotes/installer.py @@ -96,7 +96,7 @@ def install_app(name, verbose=False): return if name != "webnotes": - webnotes.check_admin_or_system_manager() + webnotes.only_for("System Manager") for before_install in app_hooks.before_install or []: webnotes.get_attr(before_install)()