ソースを参照

Made desktop more responsive, and other fixes in method routing

version-14
Rushabh Mehta 11年前
コミット
e43b670d02
6個のファイルの変更48行の追加29行の削除
  1. +1
    -1
      webnotes/core/page/applications/applications.js
  2. +31
    -12
      webnotes/core/page/desktop/desktop.css
  3. +2
    -2
      webnotes/core/page/messages/messages.js
  4. +9
    -9
      webnotes/core/page/permission_manager/permission_manager.js
  5. +4
    -4
      webnotes/core/page/user_properties/user_properties.js
  6. +1
    -1
      webnotes/installer.py

+ 1
- 1
webnotes/core/page/applications/applications.js ファイルの表示

@@ -52,7 +52,7 @@ wn.pages['applications'].onload = function(wrapper) {
if(!r.exc) { if(!r.exc) {
msgprint("<i class='icon-ok'></i> Installed"); msgprint("<i class='icon-ok'></i> Installed");
msgprint("Refreshing..."); msgprint("Refreshing...");
setTimeout(window.location.reload, 2000)
setTimeout(function() { window.location.reload() }, 2000)
} }
} }
}) })


+ 31
- 12
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 { .case-wrapper {
position: relative; position: relative;
margin: 24px;
margin: 12px;
float: left; float: left;
width: 100px; width: 100px;
height: 100px; height: 100px;
} }


.case-border {
border-radius: 5px;
padding: 20px;
display: inline-block;
margin: auto;
text-align: center;
}

.case-wrapper i { .case-wrapper i {
font-size: 32px; font-size: 32px;
min-width: 32px; min-width: 32px;
@@ -27,11 +27,30 @@


.case-label { .case-label {
color: white; color: white;
padding-top: 10px;
padding-top: 5px;
text-align: center; text-align: center;
text-shadow: 0px 0px 10px rgba(0, 0, 0, 0.6); 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 */ /* Hover and click effects */
.case-border:hover, .hover-effect { .case-border:hover, .hover-effect {
-webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.2); -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.2);


+ 2
- 2
webnotes/core/page/messages/messages.js ファイルの表示

@@ -47,7 +47,7 @@ wn.core.pages.messages = Class.extend({
var txt = $('#post-message textarea').val(); var txt = $('#post-message textarea').val();
if(txt) { if(txt) {
return wn.call({ return wn.call({
module:'core',
module: 'webnotes.core',
page:'messages', page:'messages',
method:'post', method:'post',
args: { args: {
@@ -159,7 +159,7 @@ wn.core.pages.messages = Class.extend({
show_active_users: function() { show_active_users: function() {
var me = this; var me = this;
return wn.call({ return wn.call({
module:'core',
module:'webnotes.core',
page:'messages', page:'messages',
method:'get_active_users', method:'get_active_users',
callback: function(r,rt) { callback: function(r,rt) {


+ 9
- 9
webnotes/core/page/permission_manager/permission_manager.js ファイルの表示

@@ -70,7 +70,7 @@ wn.PermissionEngine = Class.extend({
me.make_reset_button(); me.make_reset_button();
return wn.call({ return wn.call({
module:"core",
module:"webnotes.core",
page:"permission_manager", page:"permission_manager",
method: "get_roles_and_doctypes", method: "get_roles_and_doctypes",
callback: function(r) { callback: function(r) {
@@ -116,7 +116,7 @@ wn.PermissionEngine = Class.extend({
var doctype = this.doctype_select.val(); var doctype = this.doctype_select.val();
if(doctype) { if(doctype) {
wn.call({ wn.call({
module:"core",
module:"webnotes.core",
page:"permission_manager", page:"permission_manager",
method: "get_standard_permissions", method: "get_standard_permissions",
args: {doctype: doctype}, args: {doctype: doctype},
@@ -132,7 +132,7 @@ wn.PermissionEngine = Class.extend({
me.reset_button = me.wrapper.appframe.set_title_right("Reset Permissions", function() { me.reset_button = me.wrapper.appframe.set_title_right("Reset Permissions", function() {
if(wn.confirm("Reset Permissions for " + me.get_doctype() + "?", function() { if(wn.confirm("Reset Permissions for " + me.get_doctype() + "?", function() {
return wn.call({ return wn.call({
module:"core",
module:"webnotes.core",
page:"permission_manager", page:"permission_manager",
method:"reset", method:"reset",
args: { args: {
@@ -163,7 +163,7 @@ wn.PermissionEngine = Class.extend({
} }
// get permissions // get permissions
wn.call({ wn.call({
module: "core",
module: "webnotes.core",
page: "permission_manager", page: "permission_manager",
method: "get_permissions", method: "get_permissions",
args: { args: {
@@ -265,7 +265,7 @@ wn.PermissionEngine = Class.extend({
.click(function() { .click(function() {
var role = $(this).attr("data-role"); var role = $(this).attr("data-role");
wn.call({ wn.call({
module: "core",
module: "webnotes.core",
page: "permission_manager", page: "permission_manager",
method: "get_users_with_role", method: "get_users_with_role",
args: { args: {
@@ -305,7 +305,7 @@ wn.PermissionEngine = Class.extend({
.attr("data-doctype", d.parent) .attr("data-doctype", d.parent)
.click(function() { .click(function() {
return wn.call({ return wn.call({
module: "core",
module: "webnotes.core",
page: "permission_manager", page: "permission_manager",
method: "remove", method: "remove",
args: { args: {
@@ -333,7 +333,7 @@ wn.PermissionEngine = Class.extend({
value: chk.prop("checked") ? 1 : 0 value: chk.prop("checked") ? 1 : 0
} }
return wn.call({ return wn.call({
module: "core",
module: "webnotes.core",
page: "permission_manager", page: "permission_manager",
method: "update", method: "update",
args: args, args: args,
@@ -381,7 +381,7 @@ wn.PermissionEngine = Class.extend({
return; return;
} }
wn.call({ wn.call({
module: "core",
module: "webnotes.core",
page: "permission_manager", page: "permission_manager",
method: "add", method: "add",
args: args, args: args,
@@ -425,7 +425,7 @@ wn.PermissionEngine = Class.extend({
var match_value = $(dialog.wrapper).find(":radio:checked").val(); var match_value = $(dialog.wrapper).find(":radio:checked").val();
var perm = me.get_perm($(this).attr('data-name')) var perm = me.get_perm($(this).attr('data-name'))
return wn.call({ return wn.call({
module: "core",
module: "webnotes.core",
page: "permission_manager", page: "permission_manager",
method: "update_match", method: "update_match",
args: { args: {


+ 4
- 4
webnotes/core/page/user_properties/user_properties.js ファイルの表示

@@ -35,7 +35,7 @@ wn.UserProperties = Class.extend({
make: function() { make: function() {
var me = this; var me = this;
return wn.call({ return wn.call({
module:"core",
module:"webnotes.core",
page:"user_properties", page:"user_properties",
method: "get_users_and_links", method: "get_users_and_links",
callback: function(r) { callback: function(r) {
@@ -130,7 +130,7 @@ wn.UserProperties = Class.extend({
} }
// get permissions // get permissions
return wn.call({ return wn.call({
module: "core",
module: "webnotes.core",
page: "user_properties", page: "user_properties",
method: "get_properties", method: "get_properties",
args: { args: {
@@ -179,7 +179,7 @@ wn.UserProperties = Class.extend({
.attr("data-defvalue", d.defvalue) .attr("data-defvalue", d.defvalue)
.click(function() { .click(function() {
return wn.call({ return wn.call({
module: "core",
module: "webnotes.core",
page: "user_properties", page: "user_properties",
method: "remove", method: "remove",
args: { args: {
@@ -241,7 +241,7 @@ wn.UserProperties = Class.extend({
return; return;
} }
wn.call({ wn.call({
module: "core",
module: "webnotes.core",
page: "user_properties", page: "user_properties",
method: "add", method: "add",
args: args, args: args,


+ 1
- 1
webnotes/installer.py ファイルの表示

@@ -96,7 +96,7 @@ def install_app(name, verbose=False):
return return
if name != "webnotes": if name != "webnotes":
webnotes.check_admin_or_system_manager()
webnotes.only_for("System Manager")


for before_install in app_hooks.before_install or []: for before_install in app_hooks.before_install or []:
webnotes.get_attr(before_install)() webnotes.get_attr(before_install)()


読み込み中…
キャンセル
保存