From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 12 Nov 2012 20:32:17 +0000 (+0100)
Subject: Update frontpage.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b5955628de4fa17b9890c01b2c99c409527e3aaa;p=pbs.git

Update frontpage.

Remove silly slogans.
---

diff --git a/data/templates/index.html b/data/templates/index.html
index e1e47f82..51de3c0e 100644
--- a/data/templates/index.html
+++ b/data/templates/index.html
@@ -3,28 +3,26 @@
 {% block title %}{{ _("Welcome to the Pakfire Build Service") }}{% end block %}
 
 {% block body %}
-	<div class="hero-unit">
-		<h1>
-			{{ _("Pakfire Build Service") }}
-			<small>{{ random_slogan() }}</small>
-		</h1>
+	{% if current_user %}
+		<div class="page-header">
+			<h2>{{ _("Welcome, %s!") % current_user.firstname }}</h2>
+		</div>
 
-		{% if current_user %}
-			<p>
-				{{ _("Welcome %s! Great to see you again.") % current_user.firstname }}
-			</p>
-		{% else %}
-			<p>
-				{{ _("This is a service that organizes development and packaging for the IPFire distribution.") }}
-				<br />
-				{{ _("It is used to build and track packages as well as assembling images.") }}
-			</p>
-		{% end %}
 
-		<a class="btn btn-large pull-right" href="/documents">
-			{{ _("Documentation") }}
-		</a>
-	</div>
+	{% else %}
+		<div class="hero-unit ac" style="background-color: white">
+			<h1>
+				{{ _("Pakfire Build Service") }}<br>
+				<small>{{ _("Development powered by community!") }}</small>
+			</h1>
+
+			<br><br>
+
+			<a class="btn" href="/documents">{{ _("Learn more") }} &raquo;</a>
+		</div>
+
+		<hr>
+	{% end %}
 
 	{% if updates %}
 		<div class="row">
diff --git a/web/handlers_base.py b/web/handlers_base.py
index 1091efb0..9b8c5ae4 100644
--- a/web/handlers_base.py
+++ b/web/handlers_base.py
@@ -67,11 +67,6 @@ class BaseHandler(tornado.web.RequestHandler):
 		# If no one of the cases above worked we use our default locale
 		return DEFAULT_LOCALE
 
-	def random_slogan(self):
-		slogan = self.pakfire.db.get("SELECT message FROM slogans ORDER BY RAND() LIMIT 1")
-		if slogan:
-			return slogan.message
-
 	@property
 	def remote_address(self):
 		"""
@@ -108,7 +103,6 @@ class BaseHandler(tornado.web.RequestHandler):
 			"format_filemode" : backend.misc.format_filemode,
 			"lang"            : self.locale.code[:2],
 			"pakfire_version" : pakfire.__version__,
-			"random_slogan"   : self.random_slogan,
 			"year"            : time.strftime("%Y"),
 		}