Merge branch 'refs/heads/feature/663-improvements'

timble · Mar 19, 2014 · 50cf415 · 50cf415
2 parents 39150d0 + 6d9e655
commit 50cf415
Show file tree

Hide file tree

Showing 9 changed files with 61 additions and 18 deletions.
diff --git a/application/site/component/districts/view/district/templates/default.html.php b/application/site/component/districts/view/district/templates/default.html.php
@@ -17,9 +17,11 @@
 <? $officers = object('com:districts.model.districts_officers')->district($district->id)->getRowset(); ?>
 
 <? if(count($officers)) : ?>
-<div class="districts__officer">
+<div class="districts__officers">
     <? foreach ($officers as $officer) : ?>
-        <?= import('com:districts.view.district.default_officer.html', array('officer' => object('com:districts.model.officers')->id($officer->districts_officer_id)->getRow())); ?>
+        <div class="districts__officer">
+            <?= import('com:districts.view.district.default_officer.html', array('officer' => object('com:districts.model.officers')->id($officer->districts_officer_id)->getRow())); ?>
+        </div>
     <? endforeach ?>
 </div>
 <? else : ?>

diff --git a/application/site/component/police/view/page/templates/homepage.html.php b/application/site/component/police/view/page/templates/homepage.html.php
@@ -28,7 +28,7 @@
                         <a class="article__thumbnail" tabindex="-1" href="<?= $link ?>">
                             <?= helper('com:attachments.image.thumbnail', array(
                                 'attachment' => $article->attachments_attachment_id,
-                                'attribs' => array('width' => '200', 'height' => '150'))) ?>
+                                'attribs' => array('width' => '400', 'height' => '300'))) ?>
                         </a>
                     <? endif ?>
 
@@ -41,7 +41,7 @@
             </article>
         <? endforeach; ?>
         <div class="homepage__news">
-            <?= import('com:news.view.articles.list.html', array('articles' =>  object('com:news.model.articles')->sort('ordering_date')->direction('DESC')->published(true)->limit('2')->getRowset())) ?>
+            <?= import('com:news.view.articles.list.html', array('articles' =>  object('com:news.model.articles')->sort('ordering_date')->direction('DESC')->published(true)->limit('2')->exclude($article->id)->getRowset())) ?>
         </div>
     </div>
     <div class="homepage__contact">

diff --git a/application/site/public/theme/mobile/css/default.css b/application/site/public/theme/mobile/css/default.css
@@ -298,6 +298,12 @@ textarea {
   padding-right: 20px;
 }
 
+/* line 2, organisms/_districts.scss */
+.districts__officers,
+.districts__officers .districts__officer {
+  margin-bottom: 25px;
+}
+
 /* line 1, organisms/_wrap.scss */
 #wrap {
   background-color: white;
@@ -848,7 +854,7 @@ you can use the generic selector below, but it's slower:
   }
 
   /* line 42, utilities/_grid.scss */
-  .districts__officer {
+  .districts__officers {
     width: 39.50617%;
     float: left;
     margin-right: 3.7037%;
@@ -1673,7 +1679,7 @@ input[type="submit"].button::-moz-focus-inner {
   color: #004d9f;
   text-decoration: none;
   text-align: center;
-  border: 1px solid #00346c;
+  border: 1px solid #004895;
   border-radius: 8px;
   background-color: #fff;
 }
@@ -1746,8 +1752,14 @@ input[type="submit"].button::-moz-focus-inner {
     position: static;
   }
 }
+@media screen and (orientation: landscape), screen and (orientation: portrait) {
+  /* line 147, molecules/_navbar.scss */
+  .navbar__handle:hover {
+    text-decoration: none;
+  }
+}
 @media screen and (min-width: 767px) {
-  /* line 146, molecules/_navbar.scss */
+  /* line 153, molecules/_navbar.scss */
   .navbar {
     border-bottom: 0 none;
     border: 1px solid #002d5d;
@@ -1756,18 +1768,18 @@ input[type="submit"].button::-moz-focus-inner {
     border-radius: 4px;
     /* Customize the navbar links to be fill the entire space of the .navbar */
   }
-  /* line 152, molecules/_navbar.scss */
+  /* line 159, molecules/_navbar.scss */
   .navbar ul li a {
     padding: 5px 15px;
   }
-  /* line 155, molecules/_navbar.scss */
+  /* line 162, molecules/_navbar.scss */
   .navbar ul li:first-child a {
     border-left: 0;
     -webkit-border-radius: 4px 0 0 4px;
     -moz-border-radius: 4px 0 0 4px;
     border-radius: 4px 0 0 4px;
   }
-  /* line 159, molecules/_navbar.scss */
+  /* line 166, molecules/_navbar.scss */
   .navbar ul li:last-child a {
     border-right: 0;
     -webkit-border-radius: 0 4px 4px 0;

diff --git a/application/site/public/theme/mobile/css/default.scss b/application/site/public/theme/mobile/css/default.scss
@@ -4,6 +4,7 @@
 @import "utilities/reset";
 
 @import "organisms/containers";
+@import "organisms/districts";
 @import "organisms/wrap";
 @import "organisms/splash";
 @import "organisms/homepage";

diff --git a/application/site/public/theme/mobile/css/ie.css b/application/site/public/theme/mobile/css/ie.css
@@ -298,6 +298,12 @@ textarea {
   padding-right: 20px;
 }
 
+/* line 2, organisms/_districts.scss */
+.districts__officers,
+.districts__officers .districts__officer {
+  margin-bottom: 25px;
+}
+
 /* line 1, organisms/_wrap.scss */
 #wrap {
   background-color: white;
@@ -831,7 +837,7 @@ you can use the generic selector below, but it's slower:
 }
 
 /* line 42, utilities/_grid.scss */
-.districts__officer {
+.districts__officers {
   width: 39.50617%;
   float: left;
   margin-right: 3.7037%;
@@ -1644,7 +1650,7 @@ input[type="submit"].button::-moz-focus-inner {
   color: #004d9f;
   text-decoration: none;
   text-align: center;
-  border: 1px solid #00346c;
+  border: 1px solid #004895;
   border-radius: 8px;
   background-color: #fff;
 }
@@ -1716,7 +1722,13 @@ input[type="submit"].button::-moz-focus-inner {
   position: static;
 }
 
-/* line 146, molecules/_navbar.scss */
+@media screen and (orientation: landscape), screen and (orientation: portrait) {
+  /* line 147, molecules/_navbar.scss */
+  .navbar__handle:hover {
+    text-decoration: none;
+  }
+}
+/* line 153, molecules/_navbar.scss */
 .navbar {
   border-bottom: 0 none;
   border: 1px solid #002d5d;
@@ -1725,18 +1737,18 @@ input[type="submit"].button::-moz-focus-inner {
   border-radius: 4px;
   /* Customize the navbar links to be fill the entire space of the .navbar */
 }
-/* line 152, molecules/_navbar.scss */
+/* line 159, molecules/_navbar.scss */
 .navbar ul li a {
   padding: 5px 15px;
 }
-/* line 155, molecules/_navbar.scss */
+/* line 162, molecules/_navbar.scss */
 .navbar ul li:first-child a {
   border-left: 0;
   -webkit-border-radius: 4px 0 0 4px;
   -moz-border-radius: 4px 0 0 4px;
   border-radius: 4px 0 0 4px;
 }
-/* line 159, molecules/_navbar.scss */
+/* line 166, molecules/_navbar.scss */
 .navbar ul li:last-child a {
   border-right: 0;
   -webkit-border-radius: 0 4px 4px 0;

diff --git a/application/site/public/theme/mobile/css/molecules/_navbar.scss b/application/site/public/theme/mobile/css/molecules/_navbar.scss
@@ -84,7 +84,7 @@
   color: $linkColor;
   text-decoration: none;
   text-align: center;
-  border: 1px solid darken($blue, 10%);
+  border: 1px solid darken($navbarBackground, 5%);
   border-radius: 8px;
   background-color: #fff;
 
@@ -142,6 +142,13 @@
   }
 }
 
+// Prevent underline on touch devices
+@media screen and (orientation:landscape), screen and (orientation:portrait) {
+  .navbar__handle:hover {
+    text-decoration: none;
+  }
+}
+
 @include respond-min($navbarCollapseWidth) {
     .navbar {
         border-bottom: 0 none;

diff --git a/application/site/public/theme/mobile/css/organisms/_districts.scss b/application/site/public/theme/mobile/css/organisms/_districts.scss
@@ -0,0 +1,4 @@
+.districts__officers,
+.districts__officers .districts__officer {
+  margin-bottom: $grid-padding;
+}
diff --git a/application/site/public/theme/mobile/css/utilities/_grid.scss b/application/site/public/theme/mobile/css/utilities/_grid.scss
@@ -39,7 +39,7 @@
         @include span-columns(4 omega, 14);
     }
 
-    .districts__officer {
+    .districts__officers {
         @include span-columns(5, 12);
     }
 

diff --git a/component/news/model/articles.php b/component/news/model/articles.php
@@ -18,6 +18,7 @@ public function __construct(Library\ObjectConfig $config)
 
 		$this->getState()
 		    ->insert('published' , 'int')
+		    ->insert('exclude' , 'int')
             ->insert('sticky' , 'boolean', false);
 	}
 
@@ -58,5 +59,9 @@ protected function _buildQueryWhere(Library\DatabaseQuerySelect $query)
         if($state->sticky === true) {
             $query->where('tbl.sticky = :sticky')->bind(array('sticky' => '1'));
         }
+
+        if ($state->exclude) {
+            $query->where('tbl.news_article_id != :news_article_id')->bind(array('news_article_id' => $state->exclude));
+        }
 	}
 }