Merge pull request #92 from flash62au/build

support for turnouts/points

.htaccess

@@ -2,4 +2,12 @@
   Header set Cache-Control "no-cache, must-revalidate"
   Header set Pragma "no-cache"
   Header set Expires 0
+  ExpiresActive On
+  ExpiresDefault "access plus 1 minutes"
+  ExpiresByType text/javascript "access plus 1 minutes"
+  ExpiresByType text/html "access plus 1 minutes"
+  ExpiresByType text/css "access plus 1 minutes"
+  ExpiresByType image/gif "access plus 1 minutes"
+  ExpiresByType image/png "access plus 1 minutes"
+  ExpiresByType image/jpeg "access plus 1 minutes"  
 </IfModule>

Changelog.md

@@ -1,8 +1,14 @@
+# Version 1.3.27
+- updated icons
+
+# Version 1.3.26
+- support Turnouts/Points
+
 # Version 1.3.25
 - sort Routes/Automation
 - only retrieve the full Roster at connection
 - only retrieve the full Routes/Automation list at connection
-- support for messages
+- support for broadcast messages
 - bug fixes
 
 # Version 1.3.24

css/layout.css

@@ -76,8 +76,8 @@ hr{
 }
 .throttle-heading .wt-logo{
     height: 40px;
-    width: 200px;
-    background: url(../images/product-logo-ex-webthrottle.png);
+    width: 170px;
+    background: url(../images/product-logo-ex-webthrottle.svg);
     display: inline-block;
     float: center;
     background-size: 100%;

css/settings.css

@@ -78,6 +78,14 @@
     margin-bottom: 8px;
 }
 
+.turnouts-group{
+    border-radius: 5px;
+    border: 1px solid #e0e0e0;
+    padding: 0px 20px;
+    background: #fff;
+    margin-bottom: 8px;
+}
+
 .side-panel ul li:hover, .side-panel ul li.active {
     background: rgba(4,4,4, 0.05);
 }
@@ -117,7 +125,7 @@ a.edit-cur-loco{
     margin-top: 6px;
 }
 
-a.run-cur-route, a.option-btn{
+a.run-cur-route, a.throw-cur-turnout, a.close-cur-turnout, a.option-btn{
     float: right;
     text-decoration: none;
     padding: 5px 15px;
@@ -129,9 +137,10 @@ a.run-cur-route, a.option-btn{
     box-shadow: 0 0 3px #e8e8e8;
     margin-left: 5px;
 }
-a.run-cur-route{
+a.run-cur-route, a.throw-cur-turnout, a.close-cur-turnout{
     margin-top: 6px;
 }
+
 .settings-subheading.row .map-name-heading{
     padding-top: 8px;
 }

css/themes/dark.css

@@ -201,6 +201,11 @@ hr {
     background: #121212;
     box-shadow: inset 0px 0px 2px #000000;
 }
+.turnouts-group{
+    border: 1px solid #3b3b3b;
+    background: #121212;
+    box-shadow: inset 0px 0px 2px #000000;
+}
 .side-panel {
     border-right: 1px solid #000000;
     box-shadow: 1px 0 #464646; 
@@ -216,7 +221,19 @@ a.edit-cur-loco, a.option-btn{
     box-shadow: 0px 0px 2px #000000;
     color: #ffffff;
 }
-a.run-cur-route, a.option-btn{
+a.run-cur-route{
+    background: #282828;
+    border: 1px solid #3f3f3f;
+    box-shadow: 0px 0px 2px #000000;
+    color: #ffffff;
+}
+a.throw-cur-turnout{
+    background: #282828;
+    border: 1px solid #3f3f3f;
+    box-shadow: 0px 0px 2px #000000;
+    color: #ffffff;
+}
+a.close-cur-turnout{
     background: #282828;
     border: 1px solid #3f3f3f;
     box-shadow: 0px 0px 2px #000000;
@@ -240,3 +257,36 @@ p.ac-route-name{
     color: #00A3B9;
     padding-top: 4px;  
 }
+p.ac-turnout-name{
+    text-shadow: 0 0 1px #000000;
+    color: #00A3B9;
+    padding-top: 4px;  
+}
+
+
+
+.toolbar-button-throttle {
+    background-image: url('../../images/toolbar_button_throttle.svg');
+  }
+
+  .toolbar-button-cv-programmer {
+    background-image: url('../../images/toolbar_button_cv_programmer.svg');
+  }
+
+  .toolbar-button-locos {
+      background-image: url('../../images/toolbar_button_locos.svg');
+  }
+
+  .toolbar-button-routes {
+      background-image: url('../../images/toolbar_button_routes.svg');
+  }
+
+  .toolbar-button-turnouts {
+      background-image: url('../../images/toolbar_button_turnouts.svg');
+  }
+
+  .toolbar-button-functions {
+      background-image: url('../../images/toolbar_button_functions.svg');
+  }
+
+

css/throttle.css

@@ -946,6 +946,12 @@ input:checked + .slider.debug-slider{
     padding-top: 4px;
     text-align: center;
 }
+.turnouts-group .sno{
+    width: 6%;
+    padding-left: 0;
+    padding-top: 4px;
+    text-align: center;
+}
 .loco-details p.ac-loco-name{
     color: #007a8a;
     font-size: 18px;
@@ -1041,4 +1047,68 @@ input:checked + .slider.debug-slider{
     .flex-center{
       display: block;
     }
-}
+}
+
+/******************************/
+
+.toolbar-button-throttle {
+  background-image: url('../images/toolbar_button_throttle_light.svg');
+  background-position-y: bottom;
+  background-repeat: no-repeat;
+  width: 24px;
+  height: 24px;
+  padding-top: 0px;
+  display: block;
+}
+
+.toolbar-button-cv-programmer {
+  background-image: url('../images/toolbar_button_cv_programmer_light.svg');
+  background-position-y: bottom;
+  background-repeat: no-repeat;
+  width: 24px;
+  height: 24px;
+  padding-top: 0px;
+  display: block;
+}
+
+.toolbar-button-locos {
+    background-image: url('../images/toolbar_button_locos_light.svg');
+    background-position-y: bottom;
+    background-repeat: no-repeat;
+    width: 24px;
+    height: 24px;
+    padding-top: 0px;
+    display: block;
+}
+
+
+.toolbar-button-routes {
+    background-image: url('../images/toolbar_button_routes_light.svg');
+    background-position-y: bottom;
+    background-repeat: no-repeat;
+    width: 24px;
+    height: 24px;
+    padding-top: 0px;
+    display: block;
+}
+
+.toolbar-button-turnouts {
+    background-image: url('../images/toolbar_button_turnouts_light.svg');
+    background-position-y: bottom;
+    background-repeat: no-repeat;
+    width: 24px;
+    height: 24px;
+    padding-top: 0px;
+    display: block;
+}
+
+.toolbar-button-functions {
+    background-image: url('../images/toolbar_button_functions_light.svg');
+    background-position-y: bottom;
+    background-repeat: no-repeat;
+    width: 24px;
+    height: 24px;
+    padding-top: 0px;
+    display: block;
+}
+