From a15740a974458e651c017267fb611f3e0c27dc92 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 10 May 2012 12:56:40 +0530 Subject: [PATCH] fixed issue --- erpnext/website/utils.py | 5 +- public/css/wn-web.css | 134 --------------------------------------- public/js/wn-web.js | 122 +---------------------------------- 3 files changed, 4 insertions(+), 257 deletions(-) diff --git a/erpnext/website/utils.py b/erpnext/website/utils.py index ae6bff4f7e..dbe1733c53 100644 --- a/erpnext/website/utils.py +++ b/erpnext/website/utils.py @@ -72,6 +72,7 @@ def get_header(page_name): from webnotes.model.doc import Document from jinja2 import Template + import webnotes.utils def get_item(l, label): for i in l: @@ -121,7 +122,7 @@ def get_header(page_name): """).render(top_bar_items = top_bar_items, - brand=website_settings.brand_html or webnotes.get_default('company') or 'ERPNext') + brand=website_settings.brand_html or webnotes.utils.get_defaults('company') or 'ERPNext') def get_footer(page_name): """get page footer""" @@ -143,4 +144,4 @@ def get_footer(page_name): {% endfor %}
© {{ copyright }} -
""").render(website_settings.fields) \ No newline at end of file + """).render(website_settings.fields) diff --git a/public/css/wn-web.css b/public/css/wn-web.css index 78cb222249..e69de29bb2 100644 --- a/public/css/wn-web.css +++ b/public/css/wn-web.css @@ -1,134 +0,0 @@ -#body_div { - - background: url("../files/indian-textile-5.gif") repeat; - - - font-family: 'Arial', Verdana, Sans !important; - - - font-size: 14px !important; - -} - - -.small { - font-size: 12px !important; -} - - - -h1, h2, h3, h4, h5 { - font-family: 'Arial', Arial, 'Helvetica Neue' !important; -} - - -/* User CSS */ - -hr { - clear: both; -} - -p { - margin-top: 2px; -} - - -.hand { - font-family: Pacifico; - font-size: 18px; -} - -h1.top { - text-align: center; -} - -.sub-head { - text-align: center; - color: #888; - font-size: 18px; - margin: 10px 0px; -} - -.layout-main, .layout-main-section { - padding: 50px; -} - -.layout-main-section { - width: 60%; -} - -.layout-side-section { - padding-top: 50px; -} - -h2 { - //font-family: Pacifico; - font-size: 20px; - font-weight: bold; - color: #CC0000; - padding: 25px 0px 25px 0px; - clear: both; - text-align: left; -} - -.center { - text-align: center; -} - -.left { - width: 375px; - padding-right: 25px; - float: left; -} - -.right { - width: 375px; - padding-left: 25px; - float: left; -} - -.page-footer { - clear: both; - margin: -50px; - margin-top: 50px; - background-color: #FFFAED; - padding: 50px; -} - -.page-footer input { - width: 140px; - font-size: 17px; - padding: 4px; - margin-top: 2px; -} - -.page-footer .section-head { - padding: 0px; - margin-bottom: 7px; -} - -.green { - color: green; -} - -.web-form input, .web-form textarea { - width: 400px; - font-size: 17px; - padding: 4px; -} - -.link-big { - font-size: 140%; -} - -.sticky { - background-color: #F0EDDD; - padding: 15px; - margin-left: 15px; - font-size: 12px; - color: #444; - width: 240px; - min-height: 120px; - float: right; - box-shadow: 2px 2px 6px #973; -} \ No newline at end of file diff --git a/public/js/wn-web.js b/public/js/wn-web.js index e45acf239c..028515e3a0 100644 --- a/public/js/wn-web.js +++ b/public/js/wn-web.js @@ -1,121 +1 @@ -window.home_page = "home"; -// footer signup widget -// automatically adds it to the .layout-main div of the page -// adds events and also random goodies. - -erpnext.set_request_signup = function(page_name) { - - // goodies - var goodies = [ - "ERPNext also contains a module to build your website. \ - The way it works is, when you log out, the app becomes your website. \ - This website is generated from ERPNext.", - - "You can add custom fields to your transactions in ERPNext to \ - capture specific information about your business.", - - "All forms in ERPNext can be customized, if you feel there are \ - features you do not want to use, you can hide them.", - - "You can email transactions like Quotations and Invoices directly \ - from the system. You can also set this process to become automatic", - - "You can create your own Roles and assign user to those roles. \ - You can also set detailed permissions for each role in transactions.", - - "ERPNext allows you to assign any transaction like an Invoice \ - or Customer Issue to a user. You can also add comments on any \ - transaction.", - - "Stay on top with a daily, weekly or montly email summarizing all your business\ - activites and accounting data like Income, Receivables, Paybles etc.", - - "Integrate incoming Support queries to your email into ERPNext. \ - Keep track of open tickets and allocate tickets to your users." - - ]; - - - // add the footer - - $('#page-' + page_name + ' .layout-main').append('
\ -

Try before you buy. \ -Request a 30-day Free Trial.

\ -\ -

\ - ERPNext Goodies: ' - -+ goodies[parseInt(Math.random() * goodies.length)]+ - -'

\ -

ERPNext is Open Source under the GNU/General Public License.

\ -

\ -\ -\ - \ -
\ - \ - Get status updates on Twitter.
'); - - // render plusone - window.gapi && window.gapi.plusone.go(); - - // render twitter button - twttr.widgets.load(); -} - -//////////////// Hide Login for frappe! - -$(document).ready(function() { - setTimeout("$('#login-topbar-item').toggle(false);", 1000); -}); - -//////////////// Analytics - -window._gaq = window._gaq || []; -window._gaq.push(['_setAccount', 'UA-8911157-1']); -window._gaq.push(['_trackPageview']); - -(function() { - var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; - ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; - var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); -})(); - - -/////////////// Page view - -$(window).bind('hashchange', function() { - window._gaq.push(['_trackPageview', wn.get_route_str()]); -}); - -/////////////// Update conversion - -erpnext.update_conversion = function() { - $('body').append('
\ -\ -
') -}; - -////////////// Plus One - -(function() { - var po = document.createElement('script'); po.type = 'text/javascript'; po.async = true; - po.src = 'https://apis.google.com/js/plusone.js'; - var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s); -})(); - -////////////// Twitter - -(function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0]; -if(!d.getElementById(id)){js=d.createElement(s);js.id=id; -js.src="//platform.twitter.com/widgets.js"; -fjs.parentNode.insertBefore(js,fjs);}})(document,"script","twitter-wjs"); - +window.home_page = "Login Page";