updates to website footer
diff --git a/website/css/website.css b/website/css/website.css
index fb671a1..0b2dce4 100644
--- a/website/css/website.css
+++ b/website/css/website.css
@@ -12,6 +12,7 @@
}
footer {
+ text-align: left;
width: 720px;
margin: auto;
}
@@ -39,7 +40,9 @@
}
.social-icons {
- font-size: 120%
+ font-size: 120%;
+ float: right;
+ text-align: right;
}
.social-icons a:hover {
text-decoration: none;
@@ -47,11 +50,11 @@
.social-icons a i:hover {
text-decoration: none;
}
-
-.web-footer-menu {
- margin-bottom: 7px;
+.social-icons i {
+ margin-left: 5px;
}
+
.web-footer-menu ul {
list-style: none;
margin: 0px;
@@ -60,16 +63,8 @@
.web-footer-menu ul li {
display: inline;
- padding: 2px 15px;
- border-right: 1px solid #999;
-}
-
-.web-footer-menu ul li:first-child {
- padding-left: 0px;
-}
-
-.web-footer-menu ul li:last-child {
- border-right: 0px solid #777 !important;
+ padding: 2px 14px 2px 0px;
+ margin: 0px;
}
.two-column {
diff --git a/website/doctype/website_settings/website_settings.txt b/website/doctype/website_settings/website_settings.txt
index 80d721a..6af0575 100644
--- a/website/doctype/website_settings/website_settings.txt
+++ b/website/doctype/website_settings/website_settings.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-01-25 11:35:10",
"docstatus": 0,
- "modified": "2013-02-20 14:31:02",
+ "modified": "2013-02-21 10:05:09",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -168,6 +168,13 @@
"label": "Twitter Share"
},
{
+ "description": "Tweet will be shared via your user account (if specified)",
+ "doctype": "DocField",
+ "fieldname": "twitter_share_via",
+ "fieldtype": "Data",
+ "label": "Twitter Share via"
+ },
+ {
"doctype": "DocField",
"fieldname": "misc_section",
"fieldtype": "Section Break",
diff --git a/website/templates/html/outer.html b/website/templates/html/outer.html
new file mode 100644
index 0000000..ebb4923
--- /dev/null
+++ b/website/templates/html/outer.html
@@ -0,0 +1,107 @@
+{#
+ requires, brand_html, top_bar_items, footer_items, copyright, content, address
+#}
+
+{% extends "html/base.html" %}
+
+{% block body %}
+ <header>
+ </header>
+ <div id="body_div">
+ <div class="navbar-wrapper">
+ <div class="navbar{% if top_bar_background=="Black" %} navbar-inverse{% endif %}"
+ style="margin-bottom: 0px;">
+ <div class="navbar-inner">
+ <div class="container">
+ <a class="brand" href="/">{{ brand_html }}</a>
+ <ul class="nav">
+ {% for page in top_bar_items %}
+ {% if not page.parent_label %}
+ <li data-label="{{ page.label }}"
+ {% if page.child_items %}
+ class="dropdown"
+ {% endif %}>
+ <a href="{{ page.url or '#' }}"
+ {% if page.child_items %}
+ class="dropdown-toggle"
+ onclick="return false;"
+ data-toggle="dropdown"
+ {% endif %}
+ {{ page.target or ''}}>
+ {{ page.label }}
+ {% if page.child_items %}
+ <b class="caret"></b>
+ </a>
+ <ul class="dropdown-menu">
+ {% for child in page.child_items %}
+ <li data-label="{{ child.label }}">
+ <a {% if child.indent %}
+ style="padding-left:
+ {{(int(child.indent)+1)*15 }}px"
+ {% endif %}
+ href="{{ child.url }}" {{ child.target or '' }}>
+ {{ child.label }}
+ </a>
+ </li>
+ {% endfor %}
+ </ul>
+ {% else %}
+ </a>
+ {% endif %}
+ </li>
+ {% endif %}
+ {% endfor %}
+ </ul>
+ <img src="lib/images/ui/spinner.gif" id="spinner"/>
+ <ul class="nav pull-right">
+ <li id="login-topbar-item"><a href="login">Login</a></li>
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script>$('.dropdown-toggle').dropdown()</script>
+ <div class="content" id="page-{{ name }}" style="display: block;">
+ {% block content %}
+ {% endblock %}
+ </div>
+ </div>
+ <footer><div class="web-footer">
+ {% if facebook_share or google_plus_one or twitter_share or linked_in_share %}
+ <div class="social-icons" style="">
+ <span style="font-size: 11px;">{{ share_text or "Share this page on: "}}</span>
+ {% if google_plus_one %}
+ <a href="https://plus.google.com/share?url={{ url }}"
+ target="_blank"><i class="icon-google-plus"></i></a>
+ {% endif %}
+ {% if twitter_share %}
+ <a href="https://twitter.com/intent/tweet?url={{ url }}&text={{ encoded_title }}"
+ target="_blank" ><i class="icon-twitter"></i></a>
+ {% endif %}
+ {% if facebook_share %}
+ <a href="https://www.facebook.com/sharer.php?u={{ url }}&t={{ encoded_title }}&via={{ twitter_share_via }}"
+ target="_blank"><i class="icon-facebook"></i></a>
+ {% endif %}
+ {% if linked_in_share %}
+ <a href="http://www.linkedin.com/shareArticle?mini=true&url={{ url }}&title={{ encoded_title }}"
+ target="_blank"><i class="icon-linkedin"></i></a>
+ {% endif %}
+ </div>
+ {% endif %}
+ <p style="float: right; clear: right;"><a style="font-size: 90%;" href="attributions">ERPNext Powered</a></p>
+ <div class="web-footer-menu"><ul>
+ {% for item in footer_items %}
+ <li><a href="{{ item.url }}" {{ item.target }}
+ data-label="{{ item.label }}">{{ item.label }}</a></li>
+ {% endfor %}
+ </ul></div>
+ {% if copyright %}
+ <div class="web-footer-copyright">© {{ copyright }}</div>
+ {% endif %}
+ {% if address %}
+ {{ address }}
+ {% endif %}
+ </div>
+ </footer>
+
+{% endblock %}
\ No newline at end of file
diff --git a/website/templates/pages/404.html b/website/templates/pages/404.html
index 04584d9..8a676ce 100644
--- a/website/templates/pages/404.html
+++ b/website/templates/pages/404.html
@@ -1,5 +1,7 @@
{% extends "html/outer.html" %}
+{% set title="Not Found" %}
+
{% block content %}
<div class="content">
<div class="layout-wrapper layout-main">
diff --git a/website/templates/pages/about.html b/website/templates/pages/about.html
index 7ccfa77..1a60b33 100644
--- a/website/templates/pages/about.html
+++ b/website/templates/pages/about.html
@@ -1,8 +1,6 @@
{% extends "html/page.html" %}
-{% block title %}
-About Us
-{% endblock %}
+{% set title="About Us" %}
{% block content %}
<div class="layout-wrapper">
diff --git a/website/templates/pages/attributions.html b/website/templates/pages/attributions.html
index bc9d368..e587484 100644
--- a/website/templates/pages/attributions.html
+++ b/website/templates/pages/attributions.html
@@ -8,9 +8,7 @@
</style>
{% endblock %}
-{% block title %}
- ERPNext - Web Based, Open Source ERP
-{% endblock %}
+{% set title="ERPNext - Web Based, Open Source ERP" %}
{% block content %}
<div class="layout-attributions">
diff --git a/website/templates/pages/blog.html b/website/templates/pages/blog.html
index f31af42..3ad9e0a 100644
--- a/website/templates/pages/blog.html
+++ b/website/templates/pages/blog.html
@@ -8,7 +8,7 @@
{% include "css/blog.css" %}
{% endblock %}
-{% block title %}Blog{% endblock %}
+{% set title="Blog" %}
{% block content %}
<div class="layout-wrapper layout-wrapper-background">
diff --git a/website/templates/pages/contact.html b/website/templates/pages/contact.html
index 005d36a..f876da1 100644
--- a/website/templates/pages/contact.html
+++ b/website/templates/pages/contact.html
@@ -4,9 +4,7 @@
{% include "js/contact.js" %}
{% endblock %}
-{% block title %}
-Contact Us
-{% endblock %}
+{% set title="Contact Us" %}
{% block content %}
<div class="layout-wrapper">
diff --git a/website/templates/pages/error.html b/website/templates/pages/error.html
index 4fe394f..2be810d 100644
--- a/website/templates/pages/error.html
+++ b/website/templates/pages/error.html
@@ -1,5 +1,7 @@
{% extends "html/outer.html" %}
+{% set title="Error" %}
+
{% block content %}
<div class="content">
<div class="layout-wrapper layout-main">
diff --git a/website/templates/pages/login.html b/website/templates/pages/login.html
index 9dcff26..ef9b7bb 100644
--- a/website/templates/pages/login.html
+++ b/website/templates/pages/login.html
@@ -7,9 +7,7 @@
{% include "css/login.css" %}
{% endblock %}
-{% block title %}
- Login Page
-{% endblock %}
+{% set title="Login" %}
{% block body %}
<div id='login_wrapper'>
diff --git a/website/templates/pages/product_search.html b/website/templates/pages/product_search.html
index e573f7e..90c2489 100644
--- a/website/templates/pages/product_search.html
+++ b/website/templates/pages/product_search.html
@@ -1,6 +1,6 @@
{% extends "html/page.html" %}
-{% block title %}Product Search{% endblock %}
+{% set title="Product Search" %}
{% block javascript %}
{% include "js/product_list.js" %}
diff --git a/website/templates/pages/unsubscribed.html b/website/templates/pages/unsubscribed.html
index 3dc7df9..42441fe 100644
--- a/website/templates/pages/unsubscribed.html
+++ b/website/templates/pages/unsubscribed.html
@@ -1,5 +1,7 @@
{% extends "html/outer.html" %}
+{% set title="Unsubscribed" %}
+
{% block content %}
<div class="content">
<div class="layout-wrapper layout-main">
diff --git a/website/utils.py b/website/utils.py
index 84e11ce..2ef65a1 100644
--- a/website/utils.py
+++ b/website/utils.py
@@ -162,7 +162,7 @@
if not args:
return False
- args.update(get_outer_env(page_name))
+ get_outer_env(page_name, args)
return args
@@ -203,7 +203,7 @@
return None, None
-def get_outer_env(page_name):
+def get_outer_env(page_name, args):
from webnotes.utils import get_request_site_address
from urllib import quote
@@ -245,20 +245,23 @@
'int':int
})
+ args.update(ret)
+
settings = webnotes.doc("Website Settings", "Website Settings")
for k in ["brand_html", "copyright", "address", "top_bar_background", "favicon",
- "facebook_share", "google_plus_one", "twitter_share", "linked_in_share"]:
+ "facebook_share", "google_plus_one", "twitter_share", "linked_in_share", "twitter_share_via"]:
if k in settings.fields:
- ret[k] = settings.fields.get(k)
+ args[k] = settings.fields.get(k)
- if not ret.brand_html:
- ret.brand_html = "ERPNext"
- if not ret.top_bar_background:
- ret.top_bar_background = "Black"
+ if not args.brand_html:
+ args.brand_html = "ERPNext"
+ if not args.top_bar_background:
+ args.top_bar_background = "Black"
- ret.url = quote(get_request_site_address(full_address=True), "")
+ args.url = quote(get_request_site_address(full_address=True), "")
+ args.encoded_title = quote(args.title or "", "")
- return ret
+ return args
def get_home_page():
doc_name = webnotes.conn.get_value('Website Settings', None, 'home_page')