From 0a37d29cbfe5fa41fb66d517ac710c5e2762e96b Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 11 Apr 2012 15:28:07 +0530 Subject: [PATCH] form header refactor --- css/legacy/forms.css | 31 --------------------------- js/core.min.js | 6 ++++-- js/legacy/widgets/form/form_header.js | 10 ++++----- js/wn/views/doclistview.js | 6 ++++-- 4 files changed, 13 insertions(+), 40 deletions(-) diff --git a/css/legacy/forms.css b/css/legacy/forms.css index f38c9d7062..5c90cebf93 100644 --- a/css/legacy/forms.css +++ b/css/legacy/forms.css @@ -1,36 +1,5 @@ /* FORMS */ -.breadcrumbs-area { - margin-bottom: 8px; -} - -.breadcrumbs { - color: #000000; -} - -.breadcrumbs a { - color: #000000; -} - -div.form-header-main { - padding: 6px; - background: #eeeeee; /* Old browsers */ - background: -moz-linear-gradient(top, #eeeeee 0%, #cccccc 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#eeeeee), color-stop(100%,#cccccc)); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, #eeeeee 0%,#cccccc 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, #eeeeee 0%,#cccccc 100%); /* Opera 11.10+ */ - background: -ms-linear-gradient(top, #eeeeee 0%,#cccccc 100%); /* IE10+ */ - background: linear-gradient(top, #eeeeee 0%,#cccccc 100%); /* W3C */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#eeeeee', endColorstr='#cccccc',GradientType=0 ); /* IE6-9 */ - border-bottom: 1px solid #ccc; -} -div.form-header-toolbar { - padding: 4px; - background: #eeeeee; - border-top: 1px solid #f8f8f8; - border-bottom: 1px solid #ccc; -} - div.form-section-head { margin: 11px -15px 3px -15px; border-top: 1px solid #ccc; diff --git a/js/core.min.js b/js/core.min.js index 86a9d5ea0e..67dc804ad3 100644 --- a/js/core.min.js +++ b/js/core.min.js @@ -222,9 +222,11 @@ wn.views.add_list_btn=function(parent,doctype){$(parent).append(repl('\ -
\ +
\ + \ ×\ - \ +
\ +
\

%(label)s

\
\
Loading...
\ diff --git a/js/legacy/widgets/form/form_header.js b/js/legacy/widgets/form/form_header.js index d38e18e460..486e5f4ba3 100644 --- a/js/legacy/widgets/form/form_header.js +++ b/js/legacy/widgets/form/form_header.js @@ -32,12 +32,12 @@ _f.FrmHeader = Class.extend({ init: function(parent, frm) { this.buttons = {}; this.$w = $('
\ -
\ +
\ \ \ ×\
\ -
\ +
\
\
').appendTo(parent); this.$w.find('.close').click(function() { @@ -72,7 +72,7 @@ _f.FrmHeader = Class.extend({ }, refresh_toolbar: function() { // clear - this.$w.find('.form-header-toolbar').empty(); + this.$w.find('.page-app-toolbar').empty(); var p = cur_frm.get_doc_perms(); // Edit @@ -91,7 +91,7 @@ _f.FrmHeader = Class.extend({ // Save if(docstatus==0 && p[WRITE]) { this.add_button('Save', function() { cur_frm.save('Save');}, ''); - this.buttons['Save'].addClass('btn-primary'); + this.buttons['Save'].addClass('btn-info'); } // Submit if(docstatus==0 && p[SUBMIT] && (!cur_frm.doc.__islocal)) @@ -120,7 +120,7 @@ _f.FrmHeader = Class.extend({ this.buttons[label] = $(repl('', args)) .click(click) - .appendTo(this.$w.find('.form-header-toolbar')); + .appendTo(this.$w.find('.page-app-toolbar')); }, show: function() { }, diff --git a/js/wn/views/doclistview.js b/js/wn/views/doclistview.js index 7e4752c1e4..d64d9ae4f2 100644 --- a/js/wn/views/doclistview.js +++ b/js/wn/views/doclistview.js @@ -54,9 +54,11 @@ wn.views.DocListView = wn.ui.Listing.extend({ make_page: function() { var me = this; this.$page.html(repl('
\ -
\ +
\ + \ ×\ - \ +
\ +
\

%(label)s

\
\
Loading...
\