commit 7edf8997060718ffcb90ff49bd7b6efe80b4683c
author Rushabh Mehta <rmehta@gmail.com> Tue Dec 25 18:18:17 2012 +0530
committer Rushabh Mehta <rmehta@gmail.com> Tue Dec 25 18:18:17 2012 +0530
tree 5072dfc03ff73adca91db335dd3f858237c92315
parent f50c012808ce2850b16830707a3a13d17aa1b4a0

added wesite slideshow and attributions on website

website/templates/html/outer.html

diff --git a/website/templates/html/outer.html b/website/templates/html/outer.html
index fcd65f9..aef91a9 100644
--- a/website/templates/html/outer.html
+++ b/website/templates/html/outer.html
@@ -1,5 +1,5 @@
 {#
-	requires, brand, top_bar_items, footer_items, copyright, content
+	requires, brand_html, top_bar_items, footer_items, copyright, content, address
 #}
 
 {% extends "html/base.html" %}
@@ -13,7 +13,7 @@
 			style="margin-bottom: 0px;">
 			<div class="navbar-inner">
 			<div class="container">
-				<a class="brand" href="index.html">{{ brand }}</a>
+				<a class="brand" href="index.html">{{ brand_html }}</a>
 				<ul class="nav">
 					{% for page in top_bar_items %}
 						{% if not page.parent_label %}
@@ -77,7 +77,10 @@
 		{% if copyright %}
 		<div class="web-footer-copyright">&copy; {{ copyright }}</div>
 		{% endif %}
-		<div class="web-footer-powered">Powered by <a href="https://erpnext.com">ERPNext.com</a></div>
+		{% if address %}
+		{{ address }}
+		{% endif %}
+		<p><a style="font-size: 90%;" href="attributions.html">ERPNext Powered</a></p>
 		</div>
 	</footer>
 

website/templates/html/web_page.html

diff --git a/website/templates/html/web_page.html b/website/templates/html/web_page.html
index 6fa7d27..78da963 100644
--- a/website/templates/html/web_page.html
+++ b/website/templates/html/web_page.html
@@ -9,21 +9,30 @@
 {% block content %}
 	<div class="layout-wrapper layout-wrapper-background">
 		<div class="web-content" style="text-align: {{ text_align }};">
-
-			{% if layout and layout.startswith('Two column') %}
-			<div class="layout-main-section">
-			{% else %}
 			<div class="layout-main">
-			{% endif %}
-				{{ main_section_html }}
+				{% if slideshow %}
+				{{ slideshow_header }}
+			    <div id="myCarousel" class="carousel slide">
+			    	<div class="carousel-inner">
+						{% for slide in obj.slides %}
+						<div class="{% if slide.idx==1 %}active {% endif %}item">
+							<img src="{{ slide.image }}" />
+							<div class="carousel-caption">
+								<h4>{{ slide.heading }}</h4>
+								<p>{{ slide.description }}</p>
+							</div>
+						</div>
+						{% endfor %}
+					</div>
+					<a class="carousel-control left" href="#myCarousel"
+						data-slide="prev">&lsaquo;</a>
+					<a class="carousel-control right" href="#myCarousel" 
+						data-slide="next">&rsaquo;</a>
+					</div>
+					<script>$(".carousel").carousel();</script>
+				{% endif %}
+				{{ main_section }}
 			</div>
-
-			{% if layout and layout.startswith('Two column') %}
-			<div class="layout-side-section">
-				{{ side_section_html }}
-			</div>
-			{% endif %}
-			<div style="clear: both"></div>
 		</div>
 	</div>
 {% endblock %}
\ No newline at end of file