diff --git a/django/website/dashboard/templates/dashboard/basic-text-widget.html b/django/website/dashboard/templates/dashboard/basic-text-widget.html
index 4deb28b15897370dc94262037ddc4726775bdb6c..da03387986e1301751546e87995d5d054730c1d6 100644
--- a/django/website/dashboard/templates/dashboard/basic-text-widget.html
+++ b/django/website/dashboard/templates/dashboard/basic-text-widget.html
@@ -1,6 +1,6 @@
<div class='panel panel-default'>
<div class='panel-heading'>
- <i class='fa fa-align-justify fa-fw'></i>
+ <span class='fa fa-align-justify fa-fw'></span>
{{ title }}
</div>
<div class='panel-body'>
diff --git a/django/website/dashboard/templates/dashboard/dashboard.html b/django/website/dashboard/templates/dashboard/dashboard.html
index 143643f4a3eb4664f8b0916dfd5cc43d5b11bc52..c15762cc91699fabadedb5cbeb6b24fffcdf829e 100644
--- a/django/website/dashboard/templates/dashboard/dashboard.html
+++ b/django/website/dashboard/templates/dashboard/dashboard.html
@@ -10,7 +10,7 @@
{% endblock %}
{% block maincontent %}
-<h1 class="page-header"><i class="fa fa-dashboard fa-fw"></i>{% trans "Dashboard" %}</h1>
+<h1 class="page-header"><span class="fa fa-dashboard fa-fw"></span>{% trans "Dashboard" %}</h1>
{# Actual widgets #}
{% for row in rows %}
<div class='row dashboard'>
@@ -26,7 +26,7 @@
<div class="col-lg-8">
<div class="panel panel-red">
<div class="panel-heading">
- <i class="fa fa-bar-chart-o fa-fw"></i>Ebola Questions this week
+ <span class="fa fa-bar-chart-o fa-fw"></span>Ebola Questions this week
</div>
<!-- /.panel-heading -->
<div class="panel-body">
@@ -40,7 +40,7 @@
<div class="col-lg-4">
<div class="panel panel-blue">
<div class="panel-heading">
- <i class="fa fa-list fa-fw"></i>Blank widget space
+ <span class="fa fa-list fa-fw"></span>Blank widget space
</div>
<!-- /.panel-heading -->
<div class="panel-body">
@@ -54,104 +54,104 @@
</div>
<!-- /.row -->
<div class="row dashboard">
- <div class="col-lg-12">
- <div class="panel panel-default">
- <div class="panel-heading">
- <i class="fa fa-table fa-fw"></i> Recent Messages
- <div class="pull-right">
- <div class="btn-group">
- <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown">
- Actions
- <span class="caret"></span>
- </button>
- <ul class="dropdown-menu pull-right" role="menu">
- <li><a href="#">Action</a>
- </li>
- <li><a href="#">Another action</a>
- </li>
- <li><a href="#">Something else here</a>
- </li>
- <li class="divider"></li>
- <li><a href="#">Separated link</a>
- </li>
- </ul>
- </div>
- </div>
- </div>
- <!-- /.panel-heading -->
- <div class="panel-body">
- <div class="row">
- <div class="table-responsive">
- <table class="table table-bordered table-hover table-striped">
- <thead>
- <tr>
- <th>County</th>
- <th>Date</th>
- <th>Question</th>
- <th>Type</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>Lofa</td>
- <td>5/7/15</td>
- <td>What is the cause of ebola?</td>
- <td>Origin</td>
- </tr>
- <tr>
- <td>Montserrado</td>
- <td>5/7/15</td>
- <td>Is ebola still here or not?</td>
- <td>Updates</td>
- </tr>
- <tr>
- <td>Margibi</td>
- <td>5/7/15</td>
- <td>When will Liberia be free from ebola</td>
- <td>Updates</td>
- </tr>
- <tr>
- <td>Sinoe</td>
- <td>5/7/15</td>
- <td>How did Ebola come to Liberia?</td>
- <td>Origin</td>
- </tr>
- <tr>
- <td>Montserrado</td>
- <td>5/7/15</td>
- <td>HOW DO EBOLA TREAT A PERSON</td>
- <td>Measures</td>
- </tr>
- <tr>
- <td>Montserrado</td>
- <td>5/7/15</td>
- <td>I have been told that very soon that Liberia will be declar ebolo free now i want to know if there is any ebola case</td>
- <td>Updates</td>
- </tr>
- <tr>
- <td>Montserrado</td>
- <td>5/7/15</td>
- <td>EBOLA STILL IN LIBERIA?</td>
- <td>Updates</td>
- </tr>
- <tr>
- <td>Montserrado</td>
- <td>5/7/15</td>
- <td>How Many Person Have Die From Ebola In Liberia?</td>
- <td>Numbers</td>
- </tr>
- </tbody>
- </table>
- </div>
- <!-- /.table-responsive -->
- </div>
- <!-- /.col-lg-4 (nested) -->
- </div>
- <!-- /.row -->
- </div>
- <!-- /.panel-body -->
- </div>
- </div><!-- /.col-lg-12 -->
+ <div class="col-lg-12">
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <span class="fa fa-table fa-fw"></span> Recent Messages
+ <div class="pull-right">
+ <div class="btn-group">
+ <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown">
+ Actions
+ <span class="caret"></span>
+ </button>
+ <ul class="dropdown-menu pull-right" role="menu">
+ <li><a href="#">Action</a>
+ </li>
+ <li><a href="#">Another action</a>
+ </li>
+ <li><a href="#">Something else here</a>
+ </li>
+ <li class="divider"></li>
+ <li><a href="#">Separated link</a>
+ </li>
+ </ul>
+ </div>
+ </div>
+ </div>
+ <!-- /.panel-heading -->
+ <div class="panel-body">
+ <div class="row">
+ <div class="table-responsive">
+ <table class="table table-hover table-striped table-no-border">
+ <thead>
+ <tr>
+ <th>County</th>
+ <th>Date</th>
+ <th>Question</th>
+ <th>Type</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>Lofa</td>
+ <td>5/7/15</td>
+ <td>What is the cause of ebola?</td>
+ <td>Origin</td>
+ </tr>
+ <tr>
+ <td>Montserrado</td>
+ <td>5/7/15</td>
+ <td>Is ebola still here or not?</td>
+ <td>Updates</td>
+ </tr>
+ <tr>
+ <td>Margibi</td>
+ <td>5/7/15</td>
+ <td>When will Liberia be free from ebola</td>
+ <td>Updates</td>
+ </tr>
+ <tr>
+ <td>Sinoe</td>
+ <td>5/7/15</td>
+ <td>How did Ebola come to Liberia?</td>
+ <td>Origin</td>
+ </tr>
+ <tr>
+ <td>Montserrado</td>
+ <td>5/7/15</td>
+ <td>HOW DO EBOLA TREAT A PERSON</td>
+ <td>Measures</td>
+ </tr>
+ <tr>
+ <td>Montserrado</td>
+ <td>5/7/15</td>
+ <td>I have been told that very soon that Liberia will be declar ebolo free now i want to know if there is any ebola case</td>
+ <td>Updates</td>
+ </tr>
+ <tr>
+ <td>Montserrado</td>
+ <td>5/7/15</td>
+ <td>EBOLA STILL IN LIBERIA?</td>
+ <td>Updates</td>
+ </tr>
+ <tr>
+ <td>Montserrado</td>
+ <td>5/7/15</td>
+ <td>How Many Person Have Die From Ebola In Liberia?</td>
+ <td>Numbers</td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <!-- /.table-responsive -->
+ </div>
+ <!-- /.col-lg-4 (nested) -->
+ </div>
+ <!-- /.row -->
+ </div>
+ <!-- /.panel-body -->
+ </div>
+ </div><!-- /.col-lg-12 -->
</div>
{% endblock maincontent %}
diff --git a/django/website/hid/templates/hid/sources.html b/django/website/hid/templates/hid/sources.html
index 21b2ff4ee7a049ae4f86a1ca7993dd61ab32c1bf..09ba78cd883b99efc7af6c7fce711d7b77dc6d34 100644
--- a/django/website/hid/templates/hid/sources.html
+++ b/django/website/hid/templates/hid/sources.html
@@ -3,7 +3,7 @@
{% load bootstrap3 %}
{% block maincontent %}
- <h1 class="page-header"><i class="fa fa-download fa-fw"></i>{% trans "Sources" %}</h1>
+ <h1 class="page-header"><span class="fa fa-download fa-fw"></span>{% trans "Sources" %}</h1>
<ul class="list-unstyled">
{% for source in sources %}
<li class="well item-source clearfix">
@@ -13,9 +13,9 @@
<form action="{% url "sources-upload" %}" method="post" enctype="multipart/form-data" class="item-source-actions pull-right">
{% csrf_token %}
- <a class="btn btn-primary btn-block btn-sm" value="View/Edit data" type="button" href="{% url "data-view" %}"><i class="fa fa-pencil fa-fw"></i> View & Edit data</a>
+ <a class="btn btn-primary btn-block btn-sm" value="View/Edit data" type="button" href="{% url "data-view" %}"><span class="fa fa-pencil fa-fw"></span> View & Edit data</a>
{% bootstrap_form source.form show_label=False %}
- <a class="btn-sm item-source-upload btn-block btn-primary" type="button" value="Upload" href="{% url "data-view" %}"><i class="fa fa-upload fa-fw"></i> Upload</a>
+ <a class="btn-sm item-source-upload btn-block btn-primary" type="button" value="Upload" href="{% url "data-view" %}"><span class="fa fa-upload fa-fw"></span> Upload</a>
</form>
</li>
{% endfor %}
diff --git a/django/website/hid/templates/hid/table.html b/django/website/hid/templates/hid/table.html
index 97dd15f0868af75baef1de83bfb8e6808472d61a..3e2a2d91a11ce56773d969630ccb5a3343096140 100644
--- a/django/website/hid/templates/hid/table.html
+++ b/django/website/hid/templates/hid/table.html
@@ -5,7 +5,7 @@
<div class="table-container">
{% endif %}
{% block table %}
-<table{% if table.attrs %} {{ table.attrs.as_html }}{% endif %}>
+<table class="table table-hover table-striped table-no-border"{% if table.attrs %} {{ table.attrs.as_html }}{% endif %}>
{% nospaceless %}
{% block table.thead %}
<thead>
@@ -53,9 +53,11 @@
{% with table.page.paginator.count as total %}
{% with table.page.object_list|length as count %}
{% block pagination %}
+
+
<ul class="pagination {{ pagination_class }}">
{% if table.page.has_previous %}
- {% nospaceless %}{% block pagination.previous %}<li class="previous"><a href="{% querystring table.prefixed_page_field=table.page.previous_page_number %}">{% trans "Previous" %}</a></li>{% endblock pagination.previous %}{% endnospaceless %}
+ {% nospaceless %}{% block pagination.previous %}<li class="previous"><a title="previous" class="btn btn-primary btn-circle" href="{% querystring table.prefixed_page_field=table.page.previous_page_number %}"><span class="fa fa-chevron-left fw"></span></a></li>{% endblock pagination.previous %}{% endnospaceless %}
{% endif %}
{% if table.page.has_previous or table.page.has_next %}
@@ -63,7 +65,7 @@
{% endif %}
{% if table.page.has_next %}
- {% nospaceless %}{% block pagination.next %}<li class="next"><a href="{% querystring table.prefixed_page_field=table.page.next_page_number %}">{% trans "Next" %}</a></li>{% endblock pagination.next %}{% endnospaceless %}
+ {% nospaceless %}{% block pagination.next %}<li class="next"><a class="btn btn-primary btn-circle" title="next" href="{% querystring table.prefixed_page_field=table.page.next_page_number %}"><span class="fa fa-chevron-right fw"></span></a></li>{% endblock pagination.next %}{% endnospaceless %}
{% endif %}
{% nospaceless %}{% block pagination.cardinality %}<li class="cardinality">{% if total != count %}{% blocktrans %}{{ count }} of {{ total }}{% endblocktrans %}{% else %}{{ total }}{% endif %} {% if total == 1 %}{{ table.data.verbose_name }}{% else %}{{ table.data.verbose_name_plural }}{% endif %}</li>{% endblock pagination.cardinality %}{% endnospaceless %}
diff --git a/django/website/hid/templates/hid/view.html b/django/website/hid/templates/hid/view.html
index 72218a1d25c524ded3c189d6a8181563666bfd69..290bfdc705637b5e3ab64a3e99995e33e5d3154d 100644
--- a/django/website/hid/templates/hid/view.html
+++ b/django/website/hid/templates/hid/view.html
@@ -8,35 +8,35 @@
<li class="active"><a href="#home" data-toggle="tab">All</a></li>
<li><a href="#profile" data-toggle="tab">Questions</a></li>
<li><a href="#profile" data-toggle="tab">Rumors</a></li>
-
+
</ul>
-<h1 class="page-header"><i class="fa fa-pencil fa-fw"></i>{% trans "View & Edit" %}</h1>
+<h1 class="page-header"><span class="fa fa-pencil fa-fw"></span>{% trans "View & Edit" %}</h1>
<div class='row'>
- <div class="col-lg-12">
- <form action="{% url "data-view-process" %}" method="post" class="view-items-form">{% csrf_token %}
- <div class="panel panel-default">
- <div class="panel-heading">
- <i class="fa fa-table fa-fw"></i> Questions
- <div class="pull-right">
- <div class="btn-group">
- {% bootstrap_button "Save Changes" button_type="submit" value="Update" button_class="btn btn-success btn-sm table-submit" %}
- </div>
- </div>
- </div>
- <div class="panel-body">
- {% with pagination_class="col-lg-12 pull-right pager" %}
- {% render_table table %}
- {% endwith %}
-
- </div>
- <div class="panel-footer clearfix">
- {% bootstrap_button "Save Changes" button_type="submit" value="Update" button_class="btn btn-success pull-right btn-sm table-submit" %}
-
- </div>
- </div>
-
- </form>
- </div>
+ <div class="col-lg-12">
+ <form action="{% url "data-view-process" %}" method="post" class="view-items-form">{% csrf_token %}
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <span class="fa fa-table fa-fw"></span> Questions
+ <div class="pull-right">
+ <div class="btn-group">
+ {% bootstrap_button "Save Changes" button_type="submit" value="Update" button_class="btn btn-success btn-sm table-submit" %}
+ </div>
+ </div>
+ </div>
+ <div class="panel-body">
+ {% with pagination_class="pagination-circle-nav" %}
+ {% render_table table %}
+ {% endwith %}
+
+ </div>
+ <div class="panel-footer clearfix">
+ {% bootstrap_button "Save Changes" button_type="submit" value="Update" button_class="btn btn-success pull-right btn-sm table-submit" %}
+
+ </div>
+ </div>
+
+ </form>
+ </div>
</div>
{% endblock maincontent %}
diff --git a/django/website/hid/templates/hid/widgets/chart.html b/django/website/hid/templates/hid/widgets/chart.html
index 938c236f63934fd69808f7e1a7c9c0c9daa9b398..35a57e837386cc7925208934780163904cd90c2c 100644
--- a/django/website/hid/templates/hid/widgets/chart.html
+++ b/django/website/hid/templates/hid/widgets/chart.html
@@ -1,7 +1,7 @@
{% load json_data %}
<div class='panel panel-default'>
<div class='panel-heading'>
- <i class='fa fa-bar-chart-o fa-fw'></i>
+ <span class='fa fa-bar-chart-o fa-fw'></span>
{{name}}
</div>
<div class='panel-body'>
diff --git a/django/website/local_settings.py.dev b/django/website/local_settings.py.dev
index 932a1dd68b69d5e237c306a13fb147d952a29bbf..3f141b468ece868617e6cc78e667dbc4aed7afc4 100644
--- a/django/website/local_settings.py.dev
+++ b/django/website/local_settings.py.dev
@@ -22,7 +22,7 @@ DATABASES = {
'HOST': '', # Set to empty string for localhost. Not used with sqlite3.
'PORT': '', # Set to empty string for default. Not used with sqlite3.
'OPTIONS': {
- "init_command": "SET storage_engine=INNODB;SET foreign_key_checks = 0;",
+ "init_command": "SET storage_engine=INNODB;",
}
}
}
diff --git a/django/website/media/css/styles.css b/django/website/media/css/styles.css
index 9f02198071f45e9d8e47f057a43a744211ef51f6..ec6cac6d26c019f3693ca28ce5b14bfe70356197 100644
--- a/django/website/media/css/styles.css
+++ b/django/website/media/css/styles.css
@@ -6543,7 +6543,7 @@ body {
min-height: 50px;
}
.navbar-top-links > li > a,
-.navbar-top-links > li > a > i {
+.navbar-top-links > li > a > .fa {
color: #ffffff;
}
.navbar-top-links .dropdown-menu li {
@@ -6658,7 +6658,7 @@ body {
.btn-danger.btn-outline:hover {
color: white;
}
-.btn-primary > i {
+.btn-primary > .fa {
color: #ffffff;
}
.login-panel {
@@ -6722,7 +6722,7 @@ body {
padding: 25px;
border: none;
}
-.panel-heading i {
+.panel-heading .fa {
font-size: 22px;
}
.panel-blue,
@@ -6735,8 +6735,8 @@ body {
color: white;
background-color: #0f6cb6;
}
-.panel-blue .panel-heading i,
-.panel-primary .panel-heading i {
+.panel-blue .panel-heading .fa,
+.panel-primary .panel-heading .fa {
color: white;
}
.panel-blue a,
@@ -6755,7 +6755,7 @@ body {
color: white;
background-color: #56ac4a;
}
-.panel-green .panel-heading i {
+.panel-green .panel-heading .fa {
color: white;
}
.panel-green a {
@@ -6772,7 +6772,7 @@ body {
color: white;
background-color: #d8502f;
}
-.panel-red .panel-heading i {
+.panel-red .panel-heading .fa {
color: white;
}
.panel-red a {
@@ -6789,7 +6789,7 @@ body {
color: white;
background-color: #f29e30;
}
-.panel-yellow .panel-heading i {
+.panel-yellow .panel-heading .fa {
color: white;
}
.panel-yellow a {
@@ -6982,6 +6982,14 @@ a.list-group-item-danger.active:focus {
.popover {
color: #282625;
}
+.table-no-border > thead > tr > th,
+.table > tbody > tr > th,
+.table-no-border > tfoot > tr > th,
+.table > thead > tr > td,
+.table-no-border > tbody > tr > td,
+.table > tfoot > tr > td {
+ border: none;
+}
.table .form-control {
line-height: 1em;
height: inherit;
@@ -7017,6 +7025,15 @@ th.delete > label {
.messages-box > ul > li {
padding: 5px 10px;
}
+.pagination-circle-nav .btn-primary,
+.pagination-circle-nav > li:first-child > a {
+ border: none;
+ padding: 7px;
+ background-color: #0f6cb6;
+ border-bottom-left-radius: 15px;
+ border-top-left-radius: 15px;
+ float: inherit;
+}
.bootstrap3-multi-input {
display: none;
}
diff --git a/django/website/media/less/internews.less b/django/website/media/less/internews.less
index 910df0ba048fd2f75e13c6487d7f0ba41a274c5e..028946fe1e41a0acdeebefecfde364f0505906e8 100644
--- a/django/website/media/less/internews.less
+++ b/django/website/media/less/internews.less
@@ -89,7 +89,7 @@ body {
}
.navbar-top-links > li > a,
-.navbar-top-links > li > a > i {
+.navbar-top-links > li > a > .fa {
color:@body-bg;
}
@@ -244,7 +244,7 @@ body {
color: white;
}
-.btn-primary > i {
+.btn-primary > .fa {
color:@body-bg;
}
@@ -326,7 +326,7 @@ body {
font-weight:bold;
padding:25px;
border:none;
- i {
+ .fa {
font-size:22px;
}
}
@@ -337,7 +337,7 @@ body {
border-color: @brand-primary;
color: white;
background-color: @brand-primary;
- i {
+ .fa {
color:white;
}
}
@@ -355,7 +355,7 @@ body {
border-color: @brand-success;
color: white;
background-color: @brand-success;
- i {
+ .fa {
color:white;
}
}
@@ -373,7 +373,7 @@ body {
border-color: @brand-danger;
color: white;
background-color: @brand-danger;
- i {
+ .fa {
color:white;
}
}
@@ -391,7 +391,7 @@ body {
border-color: @brand-warning;
color: white;
background-color: @brand-warning;
- i {
+ .fa {
color:white;
}
}
diff --git a/django/website/media/less/view-edit.less b/django/website/media/less/view-edit.less
index c3dcc5320bd2f674324b32f96e02126811234cf8..e7022fdc1e11767cce86814cd1ce8c437921d9a4 100644
--- a/django/website/media/less/view-edit.less
+++ b/django/website/media/less/view-edit.less
@@ -1,5 +1,11 @@
// View/edit
+.table-no-border > thead > tr > th, .table > tbody > tr > th,
+.table-no-border > tfoot > tr > th, .table > thead > tr > td,
+.table-no-border > tbody > tr > td, .table > tfoot > tr > td {
+ border:none;
+}
+
.table .form-control {
line-height:1em;
height:inherit;
@@ -41,3 +47,16 @@ th.delete > label {
.messages-box > ul > li {
padding:5px 10px;
}
+
+//circle navigation
+
+.pagination-circle-nav .btn-primary,
+.pagination-circle-nav > li:first-child > a {
+ border:none;
+ padding:7px;
+ background-color:@brand-primary;
+ border-bottom-left-radius: 15px;
+ border-top-left-radius: 15px;
+ float:inherit;
+}
+
diff --git a/django/website/users/templates/registration/login.html b/django/website/users/templates/registration/login.html
index 91b052c168edbbe6019dd0145bc05c516b8f6527..a36506c78ee5745a9af5e7e196be465e3ffedaed 100644
--- a/django/website/users/templates/registration/login.html
+++ b/django/website/users/templates/registration/login.html
@@ -5,7 +5,7 @@
{% block maincontent %}
<div class="col-md-4 col-md-offset-4">
- <div class="login-panel panel panel-default login-form">
+ <div class="login-panel panel panel-default login-form modal-content">
<div class="panel-heading">
<h1 class="panel-title"><i class="fa fa-user fa-fw"></i> HID login</h1>
</div>