Merge branch 'minimal_dashboard_design' into develop

Resolved conflicts: django/website/local_settings.py.jenkins

Merge branch 'minimal_dashboard_design' into develop
521bb1e9 · Marko Samastur · b5dca31b · db9b89f2 · 521bb1e9 · 521bb1e9
Commit 521bb1e9 authored 9 years ago by Marko Samastur
--- a/deploy/pip_packages.txt
+++ b/deploy/pip_packages.txt
@@ -41,3 +41,4 @@ django-jenkins==0.17.0
 #webassets
 #pyScss
 #cssmin
+django-bootstrap3
--- a/django/website/hid/templates/hid/dashboard.html
+++ b/django/website/hid/templates/hid/dashboard.html
 {% extends "base.html" %}
 {% load i18n %}

-{% block content %}
+{% block maincontent %}
 <p>{% trans "This is the dashboard page." %}</p>
 <p><a href="{% url "logout" %}">{% trans "Log out" %}</a></p>

-{% endblock content %}
\ No newline at end of file
+{% endblock maincontent %}
\ No newline at end of file
--- a/django/website/media/css/styles.css
+++ b/django/website/media/css/styles.css
+@CHARSET "UTF-8";
+
+.internews-sidebar {
+	background-color: #000;
+	color: #FFF;
+	position: fixed;
+}
+
+html, body {
+    height: 100%;
+    overflow: hidden;
+}
+
+.internews-main, .internews-sidebar {
+	margin-bottom: -9999px;
+	padding-bottom: 9999px;
+}
\ No newline at end of file
--- a/django/website/settings.py
+++ b/django/website/settings.py
@@ -126,7 +126,7 @@ DJANGO_APPS = (
 )

 THIRD_PARTY_APPS = (
-
+    'bootstrap3',
 )

 LOCAL_APPS = (

--- a/django/website/templates/base.html
+++ b/django/website/templates/base.html
 <!doctype html>
-
+{% load bootstrap3 %}
+{% load i18n %}
 <html>
 <head>
  <meta charset="utf-8">
@@ -7,11 +8,34 @@
  <title>internewshid</title>
  <meta name="description" content="internewshid - Humanitarian Information Dashboard for Internews">
  <meta name="author" content="Mark Skipper">
+  {% bootstrap_css %}
+  <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
+  <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+  <!--[if lt IE 9]>
+  <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
+  <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
+  <![endif]-->
+  {% if 'javascript_in_head'|bootstrap_setting %}{% bootstrap_javascript jquery=True %}{% endif %}
+  {% block bootstrap3_extra_head %}{% endblock %}
+  <link href="{{ STATIC_URL }}css/styles.css" media="all" rel="stylesheet" />
 </head>

 <body>
    
    {% block content %}
+    <meta name="viewport" content="width=device-width,initial-scale=1">
+    <div class="container-fluid">
+        <div class="row-fluid">
+	        <div class="col-sm-2 col-sd-2 sidebar internews-sidebar">
+	            <h2>{% trans "Internews" %}</h2>
+	            <p>{% trans "humanitarian information dashboard (HID)" %} <a href=".">{% trans "info" %}</a></p>
+	        </div>
+            <div class="col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2 main internews-main">
+            {% block maincontent %}
+            {% endblock maincontent %}
+            </div>
+        </div>
+    </div>
    {% endblock content %}
    
 </body>

--- a/django/website/templates/registration/logged_out.html
+++ b/django/website/templates/registration/logged_out.html
@@ -2,10 +2,10 @@
 {% load i18n %}


-{% block content %}
+{% block maincontent %}
 <h1>{% trans "Logged out" %}</h1>
 <p>
 	 You are logged out.
 	 <a href="{% url "login" %}">{% trans "Log in again." %}</a>
 </p>
-{% endblock content %}
\ No newline at end of file
+{% endblock maincontent %}
\ No newline at end of file
--- a/django/website/templates/registration/login.html
+++ b/django/website/templates/registration/login.html
 {% extends "base.html" %}
 {% load i18n %}
+{% load bootstrap3 %}


-{% block content %}
-<form action="." method="post">{% csrf_token %}
-<h1>{% trans "Log in" %}</h1>
-{{ form.as_p }}
-<input type="submit" name="submit" value="{% trans "Submit" %}" />
-</form>
-{% endblock content %}
\ No newline at end of file
+{% block maincontent %}
+    <div class="login_form">
+		<form action="." method="post">{% csrf_token %}
+		{% bootstrap_form form show_label=False %}
+		<a href=".">{% trans "forgot password?" %}</a> {% bootstrap_button "Log in" button_type="submit" value="Log in" %}
+		</form>
+	</div>
+{% endblock maincontent %}
\ No newline at end of file