[Fmsystem-commits] [17499] update css and js on alesund template

[roger . kolseth]

Revision: 17499
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17499
Author:   rogkol
Date:     2018-01-04 14:01:00 -0500 (Thu, 04 Jan 2018)
Log Message:
-----------
update css and js on alesund template

Modified Paths:
--------------
    trunk/phpgwapi/templates/aalesund/css/sample.css
    trunk/phpgwapi/templates/aalesund/head.inc.php
    trunk/phpgwapi/templates/aalesund/head.tpl
    trunk/phpgwapi/templates/aalesund/js/sample.js

Added Paths:
-----------
    trunk/phpgwapi/templates/aalesund/img/Logoforslag_lilla.png
    trunk/phpgwapi/templates/aalesund/img/header2.jpg

Modified: trunk/phpgwapi/templates/aalesund/css/sample.css
===================================================================
--- trunk/phpgwapi/templates/aalesund/css/sample.css    2018-01-04 18:59:22 UTC 
(rev 17498)
+++ trunk/phpgwapi/templates/aalesund/css/sample.css    2018-01-04 19:01:00 UTC 
(rev 17499)
@@ -6,7 +6,7 @@
 
 .jumbotron {
   position: relative;
-  background: url("../img/header.jpg") no-repeat center center;
+  background: url("../img/header2.jpg") no-repeat center center;
   -webkit-background-size: cover;
   -moz-background-size: cover;
   -o-background-size: cover;
@@ -23,7 +23,15 @@
     }
 }
 
+a{
+    color: #26348B;
+}
 
+a:hover{
+    color: #26348B;
+}
+
+
 .main-icons{
     font-size: 80px;;
 }
@@ -52,16 +60,14 @@
 }
 
 .navbar-nav a:hover{
-    background-color: #1f52a8;
+    background-color: whitesmoke;
 }
 
 .navbar-nav a{
-    padding: 1.8em;
+    padding: 2.4em;
+    color: black;
 }
 
-.navbar-brand{
-    padding: 1.2em;
-}
 
 .nav-link{
     padding-right: 1rem;
@@ -69,7 +75,8 @@
 }
 
 .navbar{
-    background-color: #123c84; 
+    background-color: white;
+/*    background-color: #123c84; */
     padding: 0;
 }
 
@@ -107,7 +114,7 @@
     background-color: #428bca;
 }
 
address@hidden screen and (max-width: 560px) {
+/address@hidden screen and (max-width: 560px) {
     #update-search-result {
         position: fixed;
         bottom: 30px;
@@ -114,7 +121,7 @@
         right: 30px; 
         z-index: 10;
     }
-}
+} */
 
 
 .advance-search-padding{
@@ -122,9 +129,9 @@
 }
 
 .search-button{
-    border-right: 2px solid #428bca;
-    border-top: 2px solid #428bca;
-    border-bottom: 2px solid #428bca;
+    border-right: 2px solid #26348B;
+    border-top: 2px solid #26348B;
+    border-bottom: 2px solid #26348B;
 }
 
 .adv-search-button:hover{
@@ -186,7 +193,7 @@
 }
 
 .main-search .form-control{
-    border: 2px solid #428bca;
+    border: 2px solid #26348B;
 }
 
 .control {
@@ -291,3 +298,23 @@
     background-color: #428bca;
     border-color: #007bff;
 }
+
+
address@hidden (min-width: 768px) {
+  .modal-xl {
+    width: 90%;
+   max-width:1000px;
+  }
+}
+
+#fullSizeImage img{
+    width: 100%;
+}
+
+#images_container img{
+    cursor: pointer;
+}
+
+.navbar-brand{
+    padding: 0;
+}
\ No newline at end of file

Modified: trunk/phpgwapi/templates/aalesund/head.inc.php
===================================================================
--- trunk/phpgwapi/templates/aalesund/head.inc.php      2018-01-04 18:59:22 UTC 
(rev 17498)
+++ trunk/phpgwapi/templates/aalesund/head.inc.php      2018-01-04 19:01:00 UTC 
(rev 17499)
@@ -84,12 +84,14 @@
        
        $javascripts[] = "/phpgwapi/templates/bookingfrontend/js/minid.js";
         
+        $logoimg = "/phpgwapi/templates/aalesund/img/Logoforslag_lilla.png";
         
-        
         $bootstrapmainjs = 
"/phpgwapi/templates/aalesund/bootstrap/js/bootstrap.min.js";
         $bootstrapjs= 
"/phpgwapi/templates/aalesund/bootstrap/js/bootstrap.bundle.min.js";
         $samplejs = "/phpgwapi/templates/aalesund/js/sample.js";
         
+        
+        $GLOBALS['phpgw']->template->set_var( 'logoimg', $webserver_url . 
$logoimg );
         $GLOBALS['phpgw']->template->set_var( 'samplejs', $webserver_url . 
$samplejs );
         $GLOBALS['phpgw']->template->set_var( 'bootstrapjs', $webserver_url . 
$bootstrapjs );
         $GLOBALS['phpgw']->template->set_var( 'bootstrapmainjs', 
$webserver_url . $bootstrapmainjs );

Modified: trunk/phpgwapi/templates/aalesund/head.tpl
===================================================================
--- trunk/phpgwapi/templates/aalesund/head.tpl  2018-01-04 18:59:22 UTC (rev 
17498)
+++ trunk/phpgwapi/templates/aalesund/head.tpl  2018-01-04 19:01:00 UTC (rev 
17499)
@@ -39,7 +39,7 @@
 
     </head>
     <body class="">
-        <nav class="navbar navbar-expand-md navbar-dark">
+        <nav class="navbar navbar-expand-md">
 
                 <div class="container">
                     <button class="navbar-toggler mr-auto active" 
type="button" data-toggle="collapse" data-target="#Navbar">
@@ -46,13 +46,13 @@
                         <span class="navbar-toggler-icon"></span>
                     </button>  
                     <a class="navbar-brand" href="{site_url}">
-                        Ålesund Kommune
+                        <img src="{logoimg}" alt="Logo" style="height: 100px;">
                     </a>
                     <div class="collapse navbar-collapse text-center" 
id="Navbar">
                         <ul class="navbar-nav ml-auto">
                             <li class="nav-item active"><a class="nav-link" 
href="{site_url}">Hjem</a></li>
-                            <li class="nav-item active"><a class="nav-link" 
href="#">Søk</a></li>
-                            <li class="nav-item active"><a class="nav-link" 
href="#">Lokaler</a></li>
+   <!--                         <li class="nav-item active"><a 
class="nav-link" href="#">Søk</a></li>
+                            <li class="nav-item active"><a class="nav-link" 
href="#">Lokaler</a></li> -->
                             <li class="nav-item active"><a class="nav-link" 
href="{manual_url}">{manual_text}</a></li>
                             <li class="nav-item active"><a id="login" 
class="nav-link" href="{login_url}">{login_text}</a><span 
id="change"></span></li>
                         </ul>   

Added: trunk/phpgwapi/templates/aalesund/img/Logoforslag_lilla.png
===================================================================
(Binary files differ)

Index: trunk/phpgwapi/templates/aalesund/img/Logoforslag_lilla.png
===================================================================
--- trunk/phpgwapi/templates/aalesund/img/Logoforslag_lilla.png 2018-01-04 
18:59:22 UTC (rev 17498)
+++ trunk/phpgwapi/templates/aalesund/img/Logoforslag_lilla.png 2018-01-04 
19:01:00 UTC (rev 17499)

Property changes on: trunk/phpgwapi/templates/aalesund/img/Logoforslag_lilla.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/phpgwapi/templates/aalesund/img/header2.jpg
===================================================================
(Binary files differ)

Index: trunk/phpgwapi/templates/aalesund/img/header2.jpg
===================================================================
--- trunk/phpgwapi/templates/aalesund/img/header2.jpg   2018-01-04 18:59:22 UTC 
(rev 17498)
+++ trunk/phpgwapi/templates/aalesund/img/header2.jpg   2018-01-04 19:01:00 UTC 
(rev 17499)

Property changes on: trunk/phpgwapi/templates/aalesund/img/header2.jpg
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/phpgwapi/templates/aalesund/js/sample.js
===================================================================
--- trunk/phpgwapi/templates/aalesund/js/sample.js      2018-01-04 18:59:22 UTC 
(rev 17498)
+++ trunk/phpgwapi/templates/aalesund/js/sample.js      2018-01-04 19:01:00 UTC 
(rev 17499)
@@ -21,20 +21,31 @@
     });
 });
 
-$(function checkView() {
 
-$(window).scroll(function() {
-    var top_of_element = $("#advance-search-container").offset().top;
-    var bottom_of_element = $("#advance-search-container").offset().top + 
$("#advance-search-container").outerHeight();
-    var bottom_of_screen = $(window).scrollTop() + window.innerHeight;
-    var top_of_screen = $(window).scrollTop();
 
-    if((bottom_of_screen > top_of_element) && (top_of_screen < 
bottom_of_element)){
-        $("#update-search-result").show();
-    }
-    else {
-        $("#update-search-result").hide();
-    }
-});
 
-});
\ No newline at end of file
+function openModal(param){
+    $('#mediaModal').modal('show');
+    var src = $(param).attr('src');
+    $('#fullSizeImage').empty();
+    $('#fullSizeImage').append('<img src="'+ src +'" />');
+}
+
+
+//$(function checkView() {
+//
+//$(window).scroll(function() {
+//    var top_of_element = $("#advance-search-container").offset().top;
+//    var bottom_of_element = $("#advance-search-container").offset().top + 
$("#advance-search-container").outerHeight();
+//    var bottom_of_screen = $(window).scrollTop() + window.innerHeight;
+//    var top_of_screen = $(window).scrollTop();
+//
+//    if((bottom_of_screen > top_of_element) && (top_of_screen < 
bottom_of_element)){
+//        $("#update-search-result").show();
+//    }
+//    else {
+//        $("#update-search-result").hide();
+//    }
+//});
+//
+//});
\ No newline at end of file