calendar bug fixes
This commit is contained in:
commit
a3211d3e94
@ -181,7 +181,7 @@ div.std-footer-item {
|
||||
}
|
||||
|
||||
.layout-main-section {
|
||||
width: 70%;
|
||||
width: 71%;
|
||||
float: left;
|
||||
padding: 15px;
|
||||
background-color: #FFF;
|
||||
@ -190,7 +190,7 @@ div.std-footer-item {
|
||||
|
||||
.layout-side-section {
|
||||
width: 22%;
|
||||
float: right;
|
||||
/*float: right;*/
|
||||
color: #606060;
|
||||
overflow-x: hidden;
|
||||
padding: 15px;
|
||||
@ -1183,6 +1183,7 @@ div.psidebar div.section-item, div.psidebar .section-link {
|
||||
font-size: 11px;
|
||||
color: #666;
|
||||
}
|
||||
|
||||
/*
|
||||
* lib/css/bootstrap/headings.css
|
||||
*//* heading from bootstrap */
|
||||
@ -2815,14 +2816,9 @@ body {
|
||||
|
||||
.erpnext-footer {
|
||||
margin: 3px auto;
|
||||
color: #888;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.erpnext-footer a, .erpnext-footer a:hover, .erpnext-footer a:visited {
|
||||
color: #666;
|
||||
}
|
||||
|
||||
.module-icons {
|
||||
background: url(../images/module-icons.png) no-repeat top left;
|
||||
width:16px;
|
||||
|
@ -181,7 +181,7 @@ div.std-footer-item {
|
||||
}
|
||||
|
||||
.layout-main-section {
|
||||
width: 70%;
|
||||
width: 71%;
|
||||
float: left;
|
||||
padding: 15px;
|
||||
background-color: #FFF;
|
||||
@ -190,7 +190,7 @@ div.std-footer-item {
|
||||
|
||||
.layout-side-section {
|
||||
width: 22%;
|
||||
float: right;
|
||||
/*float: right;*/
|
||||
color: #606060;
|
||||
overflow-x: hidden;
|
||||
padding: 15px;
|
||||
@ -1623,14 +1623,9 @@ body {
|
||||
|
||||
.erpnext-footer {
|
||||
margin: 3px auto;
|
||||
color: #888;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.erpnext-footer a, .erpnext-footer a:hover, .erpnext-footer a:visited {
|
||||
color: #666;
|
||||
}
|
||||
|
||||
.module-icons {
|
||||
background: url(../images/module-icons.png) no-repeat top left;
|
||||
width:16px;
|
||||
|
@ -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; }
|
||||
|
@ -32,6 +32,9 @@ def execute():
|
||||
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:
|
||||
|
@ -17,14 +17,9 @@ body {
|
||||
|
||||
.erpnext-footer {
|
||||
margin: 3px auto;
|
||||
color: #888;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.erpnext-footer a, .erpnext-footer a:hover, .erpnext-footer a:visited {
|
||||
color: #666;
|
||||
}
|
||||
|
||||
.module-icons {
|
||||
background: url(../images/module-icons.png) no-repeat top left;
|
||||
width:16px;
|
||||
|
@ -48,7 +48,7 @@ erpnext.startup.start = function() {
|
||||
|
||||
// border to the body
|
||||
// ------------------
|
||||
$('footer').html('<div class="erpnext-footer">\
|
||||
$('footer').html('<div class="web-footer erpnext-footer">\
|
||||
Powered by <a href="https://erpnext.com">ERPNext</a></div>');
|
||||
}
|
||||
|
||||
|
@ -159,13 +159,11 @@ EmailMessage = function(parent, args, list, idx) {
|
||||
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
|
||||
|
@ -2210,7 +2210,7 @@ wn.modules_path='erpnext';wn.settings.no_history=true;$(document).bind('ready',f
|
||||
var current_module;var is_system_manager=0;var module_content_dict={};var user_full_nm={};wn.provide('erpnext.startup');erpnext.startup.set_globals=function(){pscript.is_erpnext_saas=cint(wn.control_panel.sync_with_gateway)
|
||||
if(inList(user_roles,'System Manager'))is_system_manager=1;}
|
||||
erpnext.startup.start=function(){$('#startup_div').html('Starting up...').toggle(true);erpnext.startup.set_globals();if(wn.boot.custom_css){set_style(wn.boot.custom_css);}
|
||||
if(user=='Guest'){if(wn.boot.website_settings.title_prefix){wn.title_prefix=wn.boot.website_settings.title_prefix;}}else{erpnext.toolbar.setup();erpnext.startup.set_periodic_updates();$('footer').html('<div class="erpnext-footer">\
|
||||
if(user=='Guest'){if(wn.boot.website_settings.title_prefix){wn.title_prefix=wn.boot.website_settings.title_prefix;}}else{erpnext.toolbar.setup();erpnext.startup.set_periodic_updates();$('footer').html('<div class="web-footer erpnext-footer">\
|
||||
Powered by <a href="https://erpnext.com">ERPNext</a></div>');}
|
||||
$('#startup_div').toggle(false);}
|
||||
show_chart_browser=function(nm,chart_type){var call_back=function(){if(nm=='Sales Browser'){var sb_obj=new SalesBrowser();sb_obj.set_val(chart_type);}
|
||||
|
@ -1045,7 +1045,7 @@ wn.modules_path='erpnext';wn.settings.no_history=true;$(document).bind('ready',f
|
||||
var current_module;var is_system_manager=0;var module_content_dict={};var user_full_nm={};wn.provide('erpnext.startup');erpnext.startup.set_globals=function(){pscript.is_erpnext_saas=cint(wn.control_panel.sync_with_gateway)
|
||||
if(inList(user_roles,'System Manager'))is_system_manager=1;}
|
||||
erpnext.startup.start=function(){$('#startup_div').html('Starting up...').toggle(true);erpnext.startup.set_globals();if(wn.boot.custom_css){set_style(wn.boot.custom_css);}
|
||||
if(user=='Guest'){if(wn.boot.website_settings.title_prefix){wn.title_prefix=wn.boot.website_settings.title_prefix;}}else{erpnext.toolbar.setup();erpnext.startup.set_periodic_updates();$('footer').html('<div class="erpnext-footer">\
|
||||
if(user=='Guest'){if(wn.boot.website_settings.title_prefix){wn.title_prefix=wn.boot.website_settings.title_prefix;}}else{erpnext.toolbar.setup();erpnext.startup.set_periodic_updates();$('footer').html('<div class="web-footer erpnext-footer">\
|
||||
Powered by <a href="https://erpnext.com">ERPNext</a></div>');}
|
||||
$('#startup_div').toggle(false);}
|
||||
show_chart_browser=function(nm,chart_type){var call_back=function(){if(nm=='Sales Browser'){var sb_obj=new SalesBrowser();sb_obj.set_val(chart_type);}
|
||||
|
@ -1 +1 @@
|
||||
689
|
||||
705
|
Loading…
x
Reference in New Issue
Block a user