Merge branch 'develop' of sika:vtmk/web2.0 into develop

infoscreen/static/html/infoscreen_admin.html

@@ -1,6 +1,7 @@
 <div class="row" ng-controller="infoadmin_ctrl">
     <div class="col-xs-12 col-md-6">
         <h2>Info items</h2>
+        <div>Infoitems available for rotations:</div>
         <table class="table table-striped">
             <tr><th>Item</th><th>Set duration</th><th>Add to rotation</th><th>Delete</th></tr>
             <tr ng-repeat="i in infoitems">
@@ -19,6 +20,9 @@
     </div>
     <div class="col-xs-12 col-md-6">
         <h2>Rotations</h2>
+        <div>
+            Select rotation to edit:
+        </div>
         <table class="table table-striped">
             <tr><th>Rotation</th><th>Select</th></tr>
             <tr ng-repeat="r in rotations">
@@ -27,6 +31,7 @@
             </tr>
     </table>
         <h2>Rotation: {{selected_rot.name}}</h2>
+        <div>Instances in currently selected rotation:</div>
         <table class="table table-striped">
             <tr><th>Instance</th><th>Duration</th><th>Delete</th></tr>
         <tr ng-repeat="i in selected_rot.instances">

members/static/css/simple-sidebar.css

@@ -15,16 +15,16 @@
 }
 
 #wrapper.toggled {
-    padding-left: 250px;
+    padding-left: 200px;
 }
 
 #sidebar-wrapper {
     z-index: 1000;
     position: fixed;
-    left: 250px;
+    left: 200px;
     width: 0;
     height: 100%;
-    margin-left: -250px;
+    margin-left: -200px;
     overflow-y: auto;
     background: #000;
     -webkit-transition: all 0.5s ease;
@@ -34,7 +34,7 @@
 }
 
 #wrapper.toggled #sidebar-wrapper {
-    width: 250px;
+    width: 200px;
 }
 
 #page-content-wrapper {
@@ -45,7 +45,7 @@
 
 #wrapper.toggled #page-content-wrapper {
     position: absolute;
-    margin-right: -250px;
+    margin-right: -200px;
 }
 
 /* Sidebar Styles */
@@ -53,7 +53,7 @@
 .sidebar-nav {
     position: absolute;
     top: 0;
-    width: 250px;
+    width: 200px;
     margin: 0;
     padding: 0;
     list-style: none;
@@ -98,7 +98,7 @@
 
 @media(min-width:768px) {
     #wrapper {
-        padding-left: 250px;
+        padding-left: 200px;
     }
 
     #wrapper.toggled {
@@ -106,7 +106,7 @@
     }
 
     #sidebar-wrapper {
-        width: 250px;
+        width: 200px;
     }
 
     #wrapper.toggled #sidebar-wrapper {
@@ -122,4 +122,4 @@
         position: relative;
         margin-right: 0;
     }
-}
+}

members/static/html/jasenlista.html

@@ -28,6 +28,8 @@
 			</td>
 			<td>
                 <a href="#/edit/{{x.id}}"<input type="button" value="Edit" class="btn btn-info">Muokkaa</input></a>
+			</td>
+			<td>
 				<input type="button" value="Poista" class="btn btn-danger" confirmed-click="delete_member(x.id)" ng-confirm-click="Are you sure?"/>
 			</td>
 		</tr>