diff --git a/frappe/core/page/user_permissions/user_permissions.js b/frappe/core/page/user_permissions/user_permissions.js index 2a529d97ee..2828b0ab1a 100644 --- a/frappe/core/page/user_permissions/user_permissions.js +++ b/frappe/core/page/user_permissions/user_permissions.js @@ -243,7 +243,7 @@ frappe.UserPermissions = Class.extend({ +__("These restrictions will apply for Document Types where 'Apply User Permissions' is checked for the permission rule and a field with this value is present.") +'

').appendTo(this.body); - $.each([[__("Allow User If"), 150], [__("Document Type"), 150], [__("Is"),150], ["", 50]], + $.each([[__("Allow User"), 150], [__("If Document Type"), 150], [__("Is"),150], ["", 50]], function(i, col) { $("").html(col[0]).css("width", col[1]+"px") .appendTo(me.table.find("thead tr")); @@ -300,9 +300,9 @@ frappe.UserPermissions = Class.extend({ var d = new frappe.ui.Dialog({ title: __("Add A New Restriction"), fields: [ - {fieldtype:"Select", label:__("Allow User If"), + {fieldtype:"Select", label:__("Allow User"), options:me.options.users, reqd:1, fieldname:"user"}, - {fieldtype:"Select", label: __("Select Document Type"), fieldname:"defkey", + {fieldtype:"Select", label: __("If Document Type"), fieldname:"defkey", options:me.get_link_names(), reqd:1}, {fieldtype:"Link", label:__("Is"), fieldname:"defvalue", options:'[Select]', reqd:1}, diff --git a/frappe/public/js/frappe/ui/toolbar/about.js b/frappe/public/js/frappe/ui/toolbar/about.js index b05e8d6dfb..ef3ea3a344 100644 --- a/frappe/public/js/frappe/ui/toolbar/about.js +++ b/frappe/public/js/frappe/ui/toolbar/about.js @@ -13,7 +13,7 @@ frappe.ui.misc.about = function() {

Installed Apps

\
Loading versions...
\
\ -

© 2014 Frappe Technologies Pvt. Ltd and contributers

\ +

© 2014 Frappe Technologies Pvt. Ltd and contributors

\ ", frappe.app)); frappe.ui.misc.about_dialog = d;