From 42cea47d3a7497ee33c5dccfc5d78edf4d9afd9b Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 24 Feb 2012 11:26:38 +0530 Subject: [PATCH] added todo --- css/bootstrap/icons.css | 9 ++++---- css/bootstrap/label.css | 39 +++++++++++++++++++++++++++++++++++ js/legacy/app.js | 1 - js/legacy/utils/handler.js | 1 + js/wn/ui/toolbar.min.js | 29 ++++++++++++++++---------- js/wn/ui/toolbar/toolbar.js | 39 +++++++++++++++-------------------- py/webnotes/boot.py | 1 - py/webnotes/widgets/menus.py | 40 ------------------------------------ 8 files changed, 80 insertions(+), 79 deletions(-) create mode 100644 css/bootstrap/label.css diff --git a/css/bootstrap/icons.css b/css/bootstrap/icons.css index 66979f3ef4..3b0e34ef64 100644 --- a/css/bootstrap/icons.css +++ b/css/bootstrap/icons.css @@ -1,18 +1,19 @@ -[class^="icon-"] { +[class^="icon-"], [class*=" icon-"] { display: inline-block; width: 14px; height: 14px; + line-height: 14px; vertical-align: text-top; - background-image: url(../img/glyphicons-halflings.png); + background-image: url("../lib/images/icons/glyphicons-halflings.png"); background-position: 14px 14px; background-repeat: no-repeat; *margin-right: .3em; } -[class^="icon-"]:last-child { +[class^="icon-"]:last-child, [class*=" icon-"]:last-child { *margin-left: 0; } .icon-white { - background-image: url(../img/glyphicons-halflings-white.png); + background-image: url("../lib/images/icons/glyphicons-halflings-white.png"); } .icon-glass { background-position: 0 0; diff --git a/css/bootstrap/label.css b/css/bootstrap/label.css new file mode 100644 index 0000000000..ac4e144f85 --- /dev/null +++ b/css/bootstrap/label.css @@ -0,0 +1,39 @@ +.label { + padding: 2px 4px 3px; + font-size: 11.049999999999999px; + font-weight: bold; + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #999999; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; +} +.label:hover { + color: #ffffff; + text-decoration: none; +} +.label-important { + background-color: #b94a48; +} +.label-important:hover { + background-color: #953b39; +} +.label-warning { + background-color: #f89406; +} +.label-warning:hover { + background-color: #c67605; +} +.label-success { + background-color: #468847; +} +.label-success:hover { + background-color: #356635; +} +.label-info { + background-color: #3a87ad; +} +.label-info:hover { + background-color: #2d6987; +} \ No newline at end of file diff --git a/js/legacy/app.js b/js/legacy/app.js index 8ae36d6994..5975375875 100644 --- a/js/legacy/app.js +++ b/js/legacy/app.js @@ -23,7 +23,6 @@ function startup() { user_defaults = profile.defaults; user_roles = profile.roles; user_email = profile.email; - profile.start_items = r.start_items; home_page = r.home_page; _p.letter_heads = r.letter_heads; diff --git a/js/legacy/utils/handler.js b/js/legacy/utils/handler.js index b2228bbeba..3100a6443c 100644 --- a/js/legacy/utils/handler.js +++ b/js/legacy/utils/handler.js @@ -147,6 +147,7 @@ function $c_page(module, page, method, arg, call_back, no_spinner, freeze_msg, b // generic server call (call page, object) wn.call = function(args) { + if(!args.args) args.args = {}; if(args.module && args.page) { $c_page(args.module, args.page, args.method, args.args, args.callback, args.no_spinner, false, args.btn); diff --git a/js/wn/ui/toolbar.min.js b/js/wn/ui/toolbar.min.js index 8ebe0a5108..3d9e55aeaa 100644 --- a/js/wn/ui/toolbar.min.js +++ b/js/wn/ui/toolbar.min.js @@ -1,3 +1,4 @@ + /* * lib/js/wn/ui/toolbar/selector_dialog.js */ @@ -33,8 +34,7 @@ if(rd[1]){var dt=rd[0];var dn=rd[1];this.add(dt,dn,0);}}}}); /* * lib/js/wn/ui/toolbar/toolbar.js */ -wn.ui.toolbar.Toolbar=Class.extend({init:function(){this.make();this.make_home();this.make_document();wn.ui.toolbar.recent=new wn.ui.toolbar.RecentDocs();if(in_list(user_roles,'Administrator')) -this.make_options();this.make_tools();this.set_user_name();this.make_logout();$('.dropdown-toggle').dropdown();$(document).trigger('toolbar_setup');},make:function(){$('header').append('
\ +wn.ui.toolbar.Toolbar=Class.extend({init:function(){this.make();this.make_home();this.make_document();this.make_apps();wn.ui.toolbar.recent=new wn.ui.toolbar.RecentDocs();this.make_tools();this.set_user_name();this.make_logout();$('.dropdown-toggle').dropdown();$(document).trigger('toolbar_setup');},make:function(){$('header').append('
\
\
\ \ @@ -51,13 +51,17 @@ this.make_options();this.make_tools();this.set_user_name();this.make_logout();$( \
\
\ -
');},make_home:function(){$('.navbar .nav:first').append('
  • Home
    • ')},make_document:function(){wn.ui.toolbar.new_dialog=new wn.ui.toolbar.NewDialog();wn.ui.toolbar.search=new wn.ui.toolbar.Search();wn.ui.toolbar.report=new wn.ui.toolbar.Report();$('.navbar .nav:first').append('
  • \ +
    • ');},make_home:function(){$('.navbar .nav:first').append('
  • \ + Home
    • ');$('.navbar .brand').attr('href',"#!"+home_page);},make_document:function(){wn.ui.toolbar.new_dialog=new wn.ui.toolbar.NewDialog();wn.ui.toolbar.search=new wn.ui.toolbar.Search();wn.ui.toolbar.report=new wn.ui.toolbar.Report();$('.navbar .nav:first').append('
  • \ Document\ \
    • ');},make_tools:function(){$('.navbar .nav:first').append('
  • \ \
    • ');if(has_common(user_roles,['Administrator','System Manager'])){$('#toolbar-tools').append('
  • \ - Download Backup
    • ');}},make_options:function(){$('.navbar .nav:first').append('
  • \ + Download Backup
    • ');}},make_apps:function(){$('.navbar .nav:first').append('
  • \ Options\ -