Merge branch 'master' of github.com:stef/nnmon

media/css/style.css

@@ -28,9 +28,16 @@ li { list-style: none; }
 .align-right { text-align: right;}
 dd.text { width: 30%; display: block !important; }
 p label { width: 7em; display: inline-block; }
-.button, #add_attach { display: inline-block; border: 1px solid black; padding: 3px; background: #f5f5f5; }
+.button, #add_attach {
+    background: #eee;
+    border: 1px solid #ccc;
+    border-radius: 2px;
+    -moz-border-radius: 2px;
+    display: inline-block;
+    padding: 0.3em;
+}
 
-#content ol li { list-style: decimal; }
+#global ol li { list-style: decimal; }
 
 .confirm { display: inline; position: relative; }
 /*.confirm:hover > div { display: block; }*/
@@ -64,31 +71,57 @@ filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#99000000, endCo
 
 /* tables */
 table.tablesorter {
+    width: 100%;
+    border-collapse: collapse;
+    border-spacing: 0px;
+    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.25);
+    border: 1px solid #ccc;
+    background-color: #fff;
+    margin-bottom: 50px;
+}
+
+table.tablesorter tr th, table.tablesorter tr td {
+    min-width: 75px;
+    padding: 0.5em;
+}
+
+table.tablesorter tr th {
+    background-color: #f5f5f5;
+    border: 1px solid #ccc;
+    text-transform: capitalize;
+    font-weight: normal;
+    text-align: center;
+}
+
+table.tablesorter tr td, table tr td {
+    text-align: left;
+}
+
+/*table.tablesorter {
 	font-family:arial;
-	background-color: #CDCDCD;
 	margin:10px 0pt 15px;
 	font-size: 8pt;
 	width: 100%;
 	text-align: left;
-}
-table.tablesorter thead tr th, table.tablesorter tfoot tr th {
+}*/
+/*table.tablesorter thead tr th, table.tablesorter tfoot tr th {
 	background-color: #e6EEEE;
 	border: 1px solid #FFF;
 	font-size: 8pt;
 	padding: 4px;
-}
+}*/
 table.tablesorter thead tr .header {
 	background-image: url(/site_media/img/bg.gif);
 	background-repeat: no-repeat;
 	background-position: center right;
 	cursor: pointer;
 }
-table.tablesorter tbody td {
+/*table.tablesorter tbody td {
 	color: #3D3D3D;
 	padding: 4px;
 	background-color: #FFF;
 	vertical-align: top;
-}
+}*/
 table.tablesorter tbody tr.odd td {
 	background-color:#F0F0F6;
 }
@@ -101,6 +134,15 @@ table.tablesorter thead tr .headerSortDown {
 table.tablesorter thead tr .headerSortDown, table.tablesorter thead tr .headerSortUp {
 background-color: #8dbdd8;
 }
+
+table tr.filters {
+    background: #ddd;
+}
+
+table tr.filters td{
+    padding: 0.5em;
+}
+
 /* Main and bug fix
 ---------------------------*/
 
@@ -188,6 +230,7 @@ h1 span {
   margin: 0; padding: .3em 0;
   color: #fff;
   background: #2d2d2d;
+  box-shadow: 0px 2px 5px #aaa;
 }
 #user p {
   width: 960px;
@@ -245,7 +288,7 @@ h1 span {
 #nav #current:hover,
 #nav #current:active,
 #nav #current:focus {
-  font-weight: bold;
+  color: orange;
 }
 #nav a {
   display: block;
@@ -284,20 +327,28 @@ h1 span {
 #content {
   width: 610px;
 }
-#content h2:first-child {
+#global h2:first-child {
   margin-top: 0;
 }
-#content a {
+#global a {
   color: #4183c4;
   text-decoration: none;
 }
-#content a:hover,
-#content a:active,
-#content a:focus {
-  text-decoration: underline;
+
+#global a:hover,
+#global a:active,
+#global a:focus {
+  border-bottom: thin dashed;
   outline: none;
 }
-#content h2 {
+
+#global a.button:hover {
+    border-bottom: 2px solid #ccc;
+    margin-bottom: -1px;
+}
+
+
+#global h2 {
   margin: .9em 0; padding: 0;
   font-family: 'DroidSansRegular', Helvetica, Arial, "Liberation Sans", FreeSans, sans-serif;
   font-size: 20px;
@@ -318,9 +369,10 @@ h1 span {
   text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
 }
 
-dl#comments {
-    background-color: #f5f5f5;
-    padding: 0.5em;
+div.comment {
+    background-color: #f9f9f9;
+    padding: 0.3em;
+    margin: 0.5em 0;
 }
 
 

templates/base.html

@@ -35,7 +35,7 @@
 
   <ul id="nav">
      <li><a {% if request.path == '/' %}id="current" {% endif %}href="{%root_url%}/">{% trans "Home" %}</a></li>
-     <li><a {% if request.path == '/list/' %}id="current" {% endif %}href="{%root_url%}/list">{% trans "Violations" %}</a></li>
+     <li><a {% if request.path == '/list/' or '/view' in request.path %}id="current" {% endif %}href="{%root_url%}/list">{% trans "Violations" %}</a></li>
      <li><a {% if request.path == '/about/' %}id="current" {% endif %}href="{%root_url%}/about">{% trans "What's Net Neutrality" %}</a></li>
      <li><a {% if request.path == '/start/' %}id="current" {% endif %}href="{%root_url%}/start">{% trans "Start Monitoring" %}</a></li>
      <li><a {% if request.path == '/contact/' %}id="current" {% endif %}href="{%root_url%}/contact">{% trans "Contact" %}</a></li>

templates/view.html

@@ -92,10 +92,8 @@ $(document).ready(function() {
   {% get_comment_list for v as cmt_list %}
   {% for comment in cmt_list %}
   <div class="comment">
-     <p><a href="{{ comment.user_url }}">{{
-        comment.user_name }}</a> - {{ comment.submit_date
-     }}</p>
-     {{ comment.comment }}
+     <p><a href="{{ comment.user_url }}">{{ comment.user_name }}</a> - {{ comment.submit_date }}</p>
+     <p>{{ comment.comment }}</p>
   </div>
   {% endfor %}
   <div class="toggle button">{% trans "Add comment" %}</div>