Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
Conflicts:
version.num
diff --git a/css/all-app.css b/css/all-app.css
index 7f8bbd2..e241ec9 100644
--- a/css/all-app.css
+++ b/css/all-app.css
@@ -181,7 +181,7 @@
}
.layout-main-section {
- width: 70%;
+ width: 71%;
float: left;
padding: 15px;
background-color: #FFF;
@@ -190,7 +190,7 @@
.layout-side-section {
width: 22%;
- float: right;
+ /*float: right;*/
color: #606060;
overflow-x: hidden;
padding: 15px;
@@ -1183,6 +1183,7 @@
font-size: 11px;
color: #666;
}
+
/*
* lib/css/bootstrap/headings.css
*//* heading from bootstrap */
diff --git a/css/all-web.css b/css/all-web.css
index a47a530..db235f8 100644
--- a/css/all-web.css
+++ b/css/all-web.css
@@ -181,7 +181,7 @@
}
.layout-main-section {
- width: 70%;
+ width: 71%;
float: left;
padding: 15px;
background-color: #FFF;
@@ -190,7 +190,7 @@
.layout-side-section {
width: 22%;
- float: right;
+ /*float: right;*/
color: #606060;
overflow-x: hidden;
padding: 15px;
diff --git a/erpnext/home/page/desktop/desktop.css b/erpnext/home/page/desktop/desktop.css
index bc67739..01e2ea5 100644
--- a/erpnext/home/page/desktop/desktop.css
+++ b/erpnext/home/page/desktop/desktop.css
@@ -1,6 +1,6 @@
/* Sprite CSS */
.sprite-account{ background-position: 0 0; width: 32px; height: 40px; }
-.sprite-selling{ background-position: 0 -90px; width: 40px; height: 40px; }
+.sprite-buying{ background-position: 0 -90px; width: 40px; height: 40px; }
.sprite-calendar{ background-position: 0 -180px; width: 35px; height: 40px; }
.sprite-dashboard{ background-position: 0 -270px; width: 40px; height: 29px; }
.sprite-feed{ background-position: 0 -349px; width: 32px; height: 40px; }
@@ -10,7 +10,7 @@
.sprite-production{ background-position: 0 -686px; width: 40px; height: 33px; }
.sprite-project{ background-position: 0 -769px; width: 40px; height: 22px; }
.sprite-report{ background-position: 0 -841px; width: 29px; height: 40px; }
-.sprite-buying{ background-position: 0 -931px; width: 34px; height: 40px; }
+.sprite-selling{ background-position: 0 -931px; width: 34px; height: 40px; }
.sprite-setting{ background-position: 0 -1021px; width: 37px; height: 40px; }
.sprite-stock{ background-position: 0 -1111px; width: 34px; height: 39px; }
.sprite-support{ background-position: 0 -1200px; width: 40px; height: 40px; }
@@ -21,9 +21,9 @@
.sprite-account{ margin-top: 8px; margin-left: 12px; }
-.sprite-selling{ margin-top: 8px; margin-left: 8px; }
+.sprite-selling{ margin-top: 8px; margin-left: 12px; }
.sprite-stock{ margin-top: 8px; margin-left: 8px; }
-.sprite-buying{ margin-top: 8px; margin-left: 12px; }
+.sprite-buying{ margin-top: 8px; margin-left: 8px; }
.sprite-support{ margin-top: 8px; margin-left: 8px; }
.sprite-hr{ margin-top: 12px; margin-left: 8px; }
.sprite-project{ margin-top: 16px; margin-left: 8px; }
diff --git a/erpnext/patches/jan_mar_2012/navupdate.py b/erpnext/patches/jan_mar_2012/navupdate.py
index c6c4af2..44942d9 100644
--- a/erpnext/patches/jan_mar_2012/navupdate.py
+++ b/erpnext/patches/jan_mar_2012/navupdate.py
@@ -32,6 +32,9 @@
reload_doc('utilities', 'page', 'todo')
reload_doc('utilities', 'page', 'calendar')
+ webnotes.conn.set_value('Control Panel', 'Control Panel', 'home_page',
+ 'desktop')
+
webnotes.conn.commit()
try:
diff --git a/erpnext/support/doctype/support_ticket/support_ticket.js b/erpnext/support/doctype/support_ticket/support_ticket.js
index b21480b..02c9a5d 100644
--- a/erpnext/support/doctype/support_ticket/support_ticket.js
+++ b/erpnext/support/doctype/support_ticket/support_ticket.js
@@ -159,13 +159,11 @@
this.from_email = this.from_email.replace('<', '<').replace('>', '>');
// main wrapper
- w = $a(parent, 'div', '',
- {margin:'7px 0px', padding:'0px', border:'1px solid #c8c8c8', backgroundColor:'#f9f9f9'}
- );
- $br(w, '7px');
+ w = $a(parent, 'div', 'support-ticket-wrapper well');
+ //$(w).addClass('support-ticket-wrapper');
// sender and timestamp
- $a($a(w, 'div', '', {marginBottom:'7px', padding: '7px', backgroundColor:'#d2d2f2'}),
+ $a($a(w, 'div', 'support-ticket-title'),
'span', 'link_type', {}, repl('By %(from_email)s on %(creation)s:', this),
function() {
// toggle message display on timestamp
diff --git a/version.num b/version.num
index 6e1d384..679fa6b 100644
--- a/version.num
+++ b/version.num
@@ -1 +1 @@
-687
\ No newline at end of file
+698