nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-06 06:58:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

calendar bug fixes

Browse Source
This commit is contained in:
Rushabh Mehta
2012-02-27 12:54:47 +05:30
parent aa999df088 01a7558589
commit a3211d3e94
10 changed files with 19 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
css/all-app.css
View File

@@ -181,7 +181,7 @@ div.std-footer-item {
} }
.layout-main-section { .layout-main-section {
width: 70%; width: 71%;
float: left; float: left;
padding: 15px; padding: 15px;
background-color: #FFF; background-color: #FFF;
@@ -190,7 +190,7 @@ div.std-footer-item {
.layout-side-section { .layout-side-section {
width: 22%; width: 22%;
float: right; /*float: right;*/
color: #606060; color: #606060;
overflow-x: hidden; overflow-x: hidden;
padding: 15px; padding: 15px;
@@ -1183,6 +1183,7 @@ div.psidebar div.section-item, div.psidebar .section-link {
font-size: 11px; font-size: 11px;
color: #666; color: #666;
} }
/* /*
* lib/css/bootstrap/headings.css * lib/css/bootstrap/headings.css
*//* heading from bootstrap */ *//* heading from bootstrap */
@@ -2815,14 +2816,9 @@ body {
.erpnext-footer { .erpnext-footer {
margin: 3px auto; margin: 3px auto;
color: #888;
text-align: center; text-align: center;
} }
.erpnext-footer a, .erpnext-footer a:hover, .erpnext-footer a:visited {
color: #666;
}
.module-icons { .module-icons {
background: url(../images/module-icons.png) no-repeat top left; background: url(../images/module-icons.png) no-repeat top left;
width:16px; width:16px;

9
css/all-web.css
View File

@@ -181,7 +181,7 @@ div.std-footer-item {
} }
.layout-main-section { .layout-main-section {
width: 70%; width: 71%;
float: left; float: left;
padding: 15px; padding: 15px;
background-color: #FFF; background-color: #FFF;
@@ -190,7 +190,7 @@ div.std-footer-item {
.layout-side-section { .layout-side-section {
width: 22%; width: 22%;
float: right; /*float: right;*/
color: #606060; color: #606060;
overflow-x: hidden; overflow-x: hidden;
padding: 15px; padding: 15px;
@@ -1623,14 +1623,9 @@ body {
.erpnext-footer { .erpnext-footer {
margin: 3px auto; margin: 3px auto;
color: #888;
text-align: center; text-align: center;
} }
.erpnext-footer a, .erpnext-footer a:hover, .erpnext-footer a:visited {
color: #666;
}
.module-icons { .module-icons {
background: url(../images/module-icons.png) no-repeat top left; background: url(../images/module-icons.png) no-repeat top left;
width:16px; width:16px;

8
erpnext/home/page/desktop/desktop.css
View File

@@ -1,6 +1,6 @@
/* Sprite CSS */ /* Sprite CSS */
.sprite-account{ background-position: 0 0; width: 32px; height: 40px; } .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-calendar{ background-position: 0 -180px; width: 35px; height: 40px; }
.sprite-dashboard{ background-position: 0 -270px; width: 40px; height: 29px; } .sprite-dashboard{ background-position: 0 -270px; width: 40px; height: 29px; }
.sprite-feed{ background-position: 0 -349px; width: 32px; height: 40px; } .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-production{ background-position: 0 -686px; width: 40px; height: 33px; }
.sprite-project{ background-position: 0 -769px; width: 40px; height: 22px; } .sprite-project{ background-position: 0 -769px; width: 40px; height: 22px; }
.sprite-report{ background-position: 0 -841px; width: 29px; height: 40px; } .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-setting{ background-position: 0 -1021px; width: 37px; height: 40px; }
.sprite-stock{ background-position: 0 -1111px; width: 34px; height: 39px; } .sprite-stock{ background-position: 0 -1111px; width: 34px; height: 39px; }
.sprite-support{ background-position: 0 -1200px; width: 40px; height: 40px; } .sprite-support{ background-position: 0 -1200px; width: 40px; height: 40px; }
@@ -21,9 +21,9 @@
.sprite-account{ margin-top: 8px; margin-left: 12px; } .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-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-support{ margin-top: 8px; margin-left: 8px; }
.sprite-hr{ margin-top: 12px; margin-left: 8px; } .sprite-hr{ margin-top: 12px; margin-left: 8px; }
.sprite-project{ margin-top: 16px; margin-left: 8px; } .sprite-project{ margin-top: 16px; margin-left: 8px; }

3
erpnext/patches/jan_mar_2012/navupdate.py
View File

@@ -32,6 +32,9 @@ def execute():
reload_doc('utilities', 'page', 'todo') reload_doc('utilities', 'page', 'todo')
reload_doc('utilities', 'page', 'calendar') reload_doc('utilities', 'page', 'calendar')
webnotes.conn.set_value('Control Panel', 'Control Panel', 'home_page',
'desktop')
webnotes.conn.commit() webnotes.conn.commit()
try: try:

5
erpnext/startup/startup.css
View File

@@ -17,14 +17,9 @@ body {
.erpnext-footer { .erpnext-footer {
margin: 3px auto; margin: 3px auto;
color: #888;
text-align: center; text-align: center;
} }
.erpnext-footer a, .erpnext-footer a:hover, .erpnext-footer a:visited {
color: #666;
}
.module-icons { .module-icons {
background: url(../images/module-icons.png) no-repeat top left; background: url(../images/module-icons.png) no-repeat top left;
width:16px; width:16px;

2
erpnext/startup/startup.js
View File

@@ -48,7 +48,7 @@ erpnext.startup.start = function() {
// border to the body // 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>'); Powered by <a href="https://erpnext.com">ERPNext</a></div>');
} }

8
erpnext/support/doctype/support_ticket/support_ticket.js
View File

@@ -159,13 +159,11 @@ EmailMessage = function(parent, args, list, idx) {
this.from_email = this.from_email.replace('<', '&lt;').replace('>', '&gt;'); this.from_email = this.from_email.replace('<', '&lt;').replace('>', '&gt;');
// main wrapper // main wrapper
w = $a(parent, 'div', '', w = $a(parent, 'div', 'support-ticket-wrapper well');
{margin:'7px 0px', padding:'0px', border:'1px solid #c8c8c8', backgroundColor:'#f9f9f9'} //$(w).addClass('support-ticket-wrapper');
);
$br(w, '7px');
// sender and timestamp // 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), 'span', 'link_type', {}, repl('By %(from_email)s on %(creation)s:', this),
function() { function() {
// toggle message display on timestamp // toggle message display on timestamp

2
js/all-app.js
View File

@@ -2210,7 +2210,7 @@ wn.modules_path='erpnext';wn.settings.no_history=true;$(document).bind('ready',f
wn.app={name:'ERPNext',license:'GNU/GPL - Usage Condition: All "erpnext" branding must be kept as it is',source:'https://github.com/webnotes/erpnext',publisher:'Web Notes Technologies Pvt Ltd, Mumbai',copyright:'&copy; Web Notes Technologies Pvt Ltd',version:'2.'+window._version_number} wn.app={name:'ERPNext',license:'GNU/GPL - Usage Condition: All "erpnext" branding must be kept as it is',source:'https://github.com/webnotes/erpnext',publisher:'Web Notes Technologies Pvt Ltd, Mumbai',copyright:'&copy; Web Notes Technologies Pvt Ltd',version:'2.'+window._version_number}
wn.modules_path='erpnext';wn.settings.no_history=true;$(document).bind('ready',function(){startup();});$(document).bind('toolbar_setup',function(){$('.brand').html('<b>erp</b>next');}) wn.modules_path='erpnext';wn.settings.no_history=true;$(document).bind('ready',function(){startup();});$(document).bind('toolbar_setup',function(){$('.brand').html('<b>erp</b>next');})
/* /*
* erpnext/startup/startup.js * erpnext/startup/startup.js
*/ */
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) 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;} if(inList(user_roles,'System Manager'))is_system_manager=1;}

2
js/all-web.js
View File

@@ -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) 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;} 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);} 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>');} Powered by <a href="https://erpnext.com">ERPNext</a></div>');}
$('#startup_div').toggle(false);} $('#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);} 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);}

2
version.num
View File

@@ -1 +1 @@
689 705