Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[website] updates for bootstrap3

Browse Source
This commit is contained in:
Rushabh Mehta 2013-05-27 14:47:56 +05:30
parent 5dfba486a6
commit 74560b32c1
15 changed files with 149 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
patches/may_2013/p06_make_notes.py
View File

@ -20,3 +20,4 @@ def execute():
webnotes.delete_doc("DocType", "Question") webnotes.delete_doc("DocType", "Question")
webnotes.delete_doc("DocType", "Answer") webnotes.delete_doc("DocType", "Answer")
webnotes.bean("Style Settings").save()

42
website/css/website.css
View File

@ -1,47 +1,15 @@
div.outer { h1, h2, h3, h4, h5 {
padding: 30px; font-weight: bold;
margin: 30px -30px 10px -30px;
min-height: 400px;
} }
.outer .navbar { .content {
margin: -30px -30px 20px -30px; padding-bottom: 30px;
}
footer {
text-align: left;
margin: auto;
margin-bottom: 20px;
}
.navbar-inner {
border: 0px;
border-bottom: 1px solid #ddd;
border-radius: 0px;
padding-right: 30px;
padding-left: 30px;
}
p, li {
line-height: 1.5em;
}
.layout-wrapper {
box-shadow: none;
-webkit-box-shadow: none;
-moz-box-shadow: none;
border-radius: 0px 0px 5px 5px;
}
.layout-main {
min-height: 400px;
padding: 30px;
} }
.missing-image { .missing-image {
background-color: #eee; background-color: #eee;
padding: 40px; padding: 40px;
width: 32px; width: 112px;
font-size: 32px; font-size: 32px;
color: #888; color: #888;
} }

21
website/doctype/style_settings/custom_template.css
View File

@ -66,8 +66,9 @@ div.web-footer, div.web-footer a {
} }
/* Bootstrap Navbar */ /* Bootstrap Navbar */
.navbar-inverse .navbar-inner { .navbar-inverse {
box-shadow: none; box-shadow: none;
border-radius: 0px;
background-color: #{{ doc.top_bar_background or "444444"}}; background-color: #{{ doc.top_bar_background or "444444"}};
background-repeat: repeat-x; background-repeat: repeat-x;
background-image: none; background-image: none;
@ -78,9 +79,9 @@ div.web-footer, div.web-footer a {
{%- endif %} {%- endif %}
} }
.navbar-inverse .brand, .navbar-inverse .navbar-brand,
.navbar-inverse .brand:hover, .navbar-inverse .navbar-brand:hover,
.navbar-inverse .brand:focus, .navbar-inverse .navbar-brand:focus,
.navbar-inverse .nav > li > a { .navbar-inverse .nav > li > a {
color: #{{ doc.top_bar_foreground or "fffffff"}}; color: #{{ doc.top_bar_foreground or "fffffff"}};
text-shadow: none; text-shadow: none;
@ -117,8 +118,8 @@ div.web-footer, div.web-footer a {
color: #{{ doc.top_bar_foreground or "fffffff"}}; color: #{{ doc.top_bar_foreground or "fffffff"}};
} }
.navbar-fixed-top .navbar-inner, .navbar-fixed-top,
.navbar-static-top .navbar-inner { .navbar-static-top {
-webkit-box-shadow: none; -webkit-box-shadow: none;
-moz-box-shadow: none; -moz-box-shadow: none;
box-shadow: none; box-shadow: none;
@ -190,14 +191,6 @@ div.web-footer, div.web-footer a {
text-shadow: none; text-shadow: none;
} }
.breadcrumb > li > .divider {
color: #{{ doc.page_text }};
}
.breadcrumb > .active {
color: #{{ doc.page_text }};
}
.table-striped tbody > tr:nth-child(odd) > td, .table-striped tbody > tr:nth-child(odd) > td,
.table-striped tbody > tr:nth-child(odd) > th { .table-striped tbody > tr:nth-child(odd) > th {

4
website/templates/css/blog_page.css
View File

@ -1,4 +1,8 @@
<style> <style>
[itemprop="articleBody"] {
font-size: 120%;
}
.comment-title { .comment-title {
color:#777; color:#777;
} }

2
website/templates/html/blog_footer.html
View File

@ -5,8 +5,8 @@
<ul class="breadcrumb" style="background-color: transparent; padding-left: 0px;"> <ul class="breadcrumb" style="background-color: transparent; padding-left: 0px;">
{% for category in categories %} {% for category in categories %}
<li><a href="blog?category={{ category }}">{{ category }}</a> <li><a href="blog?category={{ category }}">{{ category }}</a>
{% if not loop.last %}<span class="divider">/</span>{% endif %}</li>
{% endfor %} {% endfor %}
</ul>
<br><br> <br><br>
{% endif %} {% endif %}
<p>Show posts by <a href="blog">everyone</a>. Meet the <a href="writers">writers</a> of this blog</p> <p>Show posts by <a href="blog">everyone</a>. Meet the <a href="writers">writers</a> of this blog</p>

2
website/templates/html/blog_page.html
View File

@ -37,7 +37,7 @@
{% include 'app/website/templates/html/comment.html' %} {% include 'app/website/templates/html/comment.html' %}
</div> </div>
<div><button class="btn add-comment">{{ texts.add_comment }}</button></div> <div><button class="btn btn-default add-comment">{{ texts.add_comment }}</button></div>
<div style="display: none; margin-top: 10px;" <div style="display: none; margin-top: 10px;"
id="comment-form"> id="comment-form">
<div class="alert" style="display:none;"></div> <div class="alert" style="display:none;"></div>

134
website/templates/html/footer.html
View File

@ -1,71 +1,79 @@
<footer class="container"><div class="web-footer"> <footer class="container">
{% if facebook_share or google_plus_one or twitter_share or linked_in_share %} <div class="web-footer row">
<div class="social-icons" style=""> <div class="col col-lg-12">
<span style="font-size: 11px;">{{ share_text or "Share this page on: "}}</span> {% if facebook_share or google_plus_one or twitter_share or linked_in_share %}
{% if google_plus_one %} <div class="social-icons" style="">
<a href="https://plus.google.com/share?url={{ url }}" <span style="font-size: 11px;">{{ share_text or "Share this page on: "}}</span>
target="_blank"><i class="icon-google-plus"></i></a> {% 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 %} {% endif %}
{% if twitter_share %} <p style="float: right; clear: right;">
<a href="https://twitter.com/intent/tweet?url={{ url }}&text={{ encoded_title }}" <a style="font-size: 90%; color: #888;" href="attributions">ERPNext Powered</a>
target="_blank" ><i class="icon-twitter"></i></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">&copy; {{ copyright }}</div>
{% endif %} {% endif %}
{% if facebook_share %} {% if address %}
<a href="https://www.facebook.com/sharer.php?u={{ url }}&t={{ encoded_title }}&via={{ twitter_share_via }}" {{ address }}
target="_blank"><i class="icon-facebook"></i></a>
{% endif %} {% endif %}
{% if linked_in_share %} <br>
<a href="http://www.linkedin.com/shareArticle?mini=true&url={{ url }}&title={{ encoded_title }}" <div class="input-group col col-lg-6 col-offset-3">
target="_blank"><i class="icon-linkedin"></i></a> <input type="text" id="footer-subscribe-email" placeholder="Your email address...">
{% endif %} <span class="input-group-btn">
</div> <button class="btn btn-default" type="button" id="footer-subscribe-button">Stay Updated</button>
{% endif %} </span>
<p style="float: right; clear: right;"> </div>
<a style="font-size: 90%; color: #888;" href="attributions">ERPNext Powered</a> <br>
</p> <script>
<div class="web-footer-menu"> $("#footer-subscribe-button").click(function() {
<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">&copy; {{ copyright }}</div>
{% endif %}
{% if address %}
{{ address }}
{% endif %}
<p><div class="input-append" style="text-align: center; margin:30px 0px;">
<input class="col col-lg-3" id="footer-subscribe-email" type="text" placeholder="Your email address...">
<button class="btn" type="button" id="footer-subscribe-button">Stay Updated</button>
</div></p>
<script>
$("#footer-subscribe-button").click(function() {
$("#footer-subscribe-email").attr('disabled', true); $("#footer-subscribe-email").attr('disabled', true);
$("#footer-subscribe-button").html("Sending...") $("#footer-subscribe-button").html("Sending...")
.attr("disabled", true); .attr("disabled", true);
if($("#footer-subscribe-email").val()) { if($("#footer-subscribe-email").val()) {
erpnext.send_message({ erpnext.send_message({
subject:"Subscribe me", subject:"Subscribe me",
sender: $("#footer-subscribe-email").val(), sender: $("#footer-subscribe-email").val(),
message: "Subscribe to newsletter (via website footer).", message: "Subscribe to newsletter (via website footer).",
callback: function(r) { callback: function(r) {
if(!r.exc) { if(!r.exc) {
$("#footer-subscribe-button").html("Thank You :)") $("#footer-subscribe-button").html("Thank You :)")
.addClass("btn-success").attr("disabled", true); .addClass("btn-success").attr("disabled", true);
} else { } else {
$("#footer-subscribe-button").html("Error :( Not a valid id?") $("#footer-subscribe-button").html("Error :( Not a valid id?")
.addClass("btn-danger").attr("disabled", false); .addClass("btn-danger").attr("disabled", false);
$("#footer-subscribe-email").val("").attr('disabled', false); $("#footer-subscribe-email").val("").attr('disabled', false);
}
} }
} });
}); }
} });
}); </script>
</script> </div>
</div>
</div> </div>
</footer> </footer>

63
website/templates/html/navbar.html
View File

@ -1,37 +1,36 @@
<div class="navbar navbar-inverse" style=""> <div class="navbar navbar-inverse" style="">
<div class="navbar-inner"> {%- if brand_html %}<a class="navbar-brand" href="index">{{ brand_html }}</a>{% endif -%}
{%- if brand_html %}<a class="brand" href="index">{{ brand_html }}</a>{% endif -%} <div class="container">
<div class="container"> <button type="button" class="navbar-toggle" data-toggle="collapse"
<button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> data-target=".navbar-responsive-collapse">
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> </button>
<div class="nav-collapse collapse"> <div class="nav-collapse collapse navbar-responsive-collapse">
<ul class="nav"> <ul class="nav navbar-nav">
{%- for page in top_bar_items -%} {%- for page in top_bar_items -%}
{% if not page.parent_label -%} {% if not page.parent_label -%}
<li data-label="{{ page.label }}" {% if page.child_items %} class="dropdown"{% endif %}> <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 ''}}> <a href="{{ page.url or '#' }}" {% if page.child_items %} class="dropdown-toggle" onclick="return false;" data-toggle="dropdown"{% endif %} {{ page.target or ''}}>
{{ page.label }} {{ page.label }}
{%- if page.child_items -%} {%- if page.child_items -%}
<b class="caret"></b> <b class="caret"></b>
</a> </a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
{%- for child in page.child_items -%} {%- for child in page.child_items -%}
<li data-label="{{ child.label }}"> <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> <a {% if child.indent %} style="padding-left: {{(int(child.indent)+1)*15 }}px"{% endif %} href="{{ child.url }}" {{ child.target or '' }}>{{ child.label }}</a>
</li> </li>
{%- endfor -%} {%- endfor -%}
</ul> </ul>
{%- else -%} {%- else -%}
</a> </a>
{%- endif -%}
</li>
{%- endif -%} {%- endif -%}
{%- endfor %} </li>
</ul> {%- endif -%}
</div> {%- endfor %}
</ul>
</div> </div>
</div> </div>
</div> </div>

2
website/templates/html/product_breadcrumbs.html
View File

@ -3,7 +3,7 @@
<div class="clearfix"> <div class="clearfix">
<ul class="breadcrumb"> <ul class="breadcrumb">
{% for ig in obj.parent_groups[:-1] %} {% for ig in obj.parent_groups[:-1] %}
<li><a href="{{ ig.page_name }}.html">{{ ig.name }}</a> <span class="divider">/</span></li> <li><a href="{{ ig.page_name }}.html">{{ ig.name }}</a></li>
{% endfor %} {% endfor %}
<li class="active">{{ obj.parent_groups[-1].name }}</li> <li class="active">{{ obj.parent_groups[-1].name }}</li>
</ul> </ul>

2
website/templates/html/product_group.html
View File

@ -13,8 +13,6 @@
<h3>{{ name }}</h3> <h3>{{ name }}</h3>
{% endif %} {% endif %}
</div> </div>
{% include 'app/website/templates/html/product_search_box.html' %}
{% include 'app/website/templates/html/product_breadcrumbs.html' %}
<div class="col col-lg-12"> <div class="col col-lg-12">
{% if sub_groups %} {% if sub_groups %}
<hr /> <hr />

13
website/templates/html/product_search_box.html
View File

@ -1,11 +1,12 @@
<div class="col col-lg-12 clearfix"> <div class="col col-lg-12 clearfix">
<div class="pull-right" style="margin-top: 15px;"> <div class="pull-right" style="margin-top: 15px; margin-bottom: 15px;">
<form class="form-search"> <form class="form-search">
<div class="input-append"> <div class="input-group col col-lg-4 col-offset-8">
<input type="text" class="col col-lg-2 search-query" <input type="text" id="product-search" placeholder="Product Search...">
id="product-search" placeholder="Product Search..." /> <span class="input-group-btn">
<button class="btn" id="btn-product-search"> <button class="btn btn-default" type="button" id="btn-product-search">
<i class="icon-search"></i></button> <i class="icon-search"></i></button>
</span>
</div> </div>
</form> </form>
</div> </div>

2
website/templates/js/blog.js
View File

@ -87,7 +87,7 @@ var blog = {
if(!data.length || data.length < 20) { if(!data.length || data.length < 20) {
if(blog.start) { if(blog.start) {
$("#next-page").toggle(false) $("#next-page").toggle(false)
.parent().append("<div class='alert alert-info'>Nothing more to show.</div>"); .parent().append("<div class='text-muted'>Nothing more to show.</div>");
} else { } else {
$("#next-page").toggle(false) $("#next-page").toggle(false)
.parent().append("<div class='alert'>No blogs written yet.</div>"); .parent().append("<div class='alert'>No blogs written yet.</div>");

2
website/templates/js/product_list.js
View File

@ -40,7 +40,7 @@ window.render_product_list = function(data) {
.replaceWith("<div class='alert'>No products found.</div>"); .replaceWith("<div class='alert'>No products found.</div>");
} else { } else {
$(".more-btn") $(".more-btn")
.replaceWith("<div class='alert'>Nothing more to show.</div>"); .replaceWith("<div class='text-muted'>Nothing more to show.</div>");
} }
} else { } else {
$(".more-btn").toggle(true) $(".more-btn").toggle(true)

2
website/templates/pages/blog.html
View File

@ -25,7 +25,7 @@
<!-- blog list will be generated dynamically --> <!-- blog list will be generated dynamically -->
</div> </div>
<div style="text-align: center;"> <div style="text-align: center;">
<button id="next-page" class="btn" <button id="next-page" class="btn btn-default"
style="display:none;">More...</button> style="display:none;">More...</button>
</div> </div>
</div> </div>

30
website/templates/pages/contact.html
View File

@ -11,24 +11,28 @@
<h3>{{ obj.doc.heading or "Contact Us"}}</h3> <h3>{{ obj.doc.heading or "Contact Us"}}</h3>
<div class="row"> <div class="row">
<div class="web-form col col-lg-8"> <div class="web-form col col-lg-8">
<div class="row"> <p id="contact-alert" class="alert"
<div class="col col-lg-6"> style="display: none;">&nbsp;</p>
<p id="contact-alert" class="alert" <p>
style="display: none;">&nbsp;</p> <select name="subject">
</div>
</div>
<div class="clearfix"></div>
<p><select class="col col-lg-6" name="subject">
{% for option in obj.query_options %} {% for option in obj.query_options %}
<option value="{{ option }}">{{ option }}</option> <option value="{{ option }}">{{ option }}</option>
{% endfor %} {% endfor %}
</select></p> </select>
<p><input class="col col-lg-6" name="email" type="text" placeholder="Your Email Address" /></p> </p>
<p><textarea class="col col-lg-6" rows="10" name="message"></textarea></p> <p>
<p><button class="btn btn-primary btn-send">Send</button></p> <input name="email" type="text"
placeholder="Your Email Address" />
</p>
<p>
<textarea rows="10" name="message"></textarea>
</p>
<p>
<button class="btn btn-primary btn-send">Send</button>
</p>
</div> </div>
{% if obj.doc.address %} {% if obj.doc.address %}
<div class="col col-lg-3 alert" style="margin-top: 20px;" itemscope itemtype="http://schema.org/PostalAddress"> <div class="col col-lg-3 col-offset-1 alert" style="margin-top: 20px;" itemscope itemtype="http://schema.org/PostalAddress">
<h4><i class="icon-map-marker"></i> {{ obj.address.address_title }}</h4> <h4><i class="icon-map-marker"></i> {{ obj.address.address_title }}</h4>
{% if obj.address.address_line1 %} {% if obj.address.address_line1 %}
<span itemprop="streetAddress">{{ obj.address.address_line1 }}</span><br> <span itemprop="streetAddress">{{ obj.address.address_line1 }}</span><br>