TTMK/web2.0-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
HooVee
2016-10-08 14:18:41 +03:00
parent 827b9e62fe 5cd3c893f4
commit 06d9e1cdcd
3 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
infoscreen/static/html/infoscreen_admin.html
+5
View File
@@ -1,6 +1,7 @@
<div class="row" ng-controller="infoadmin_ctrl"> <div class="row" ng-controller="infoadmin_ctrl">
<div class="col-xs-12 col-md-6"> <div class="col-xs-12 col-md-6">
<h2>Info items</h2> <h2>Info items</h2>
<div>Infoitems available for rotations:</div>
<table class="table table-striped"> <table class="table table-striped">
<tr><th>Item</th><th>Set duration</th><th>Add to rotation</th><th>Delete</th></tr> <tr><th>Item</th><th>Set duration</th><th>Add to rotation</th><th>Delete</th></tr>
<tr ng-repeat="i in infoitems"> <tr ng-repeat="i in infoitems">
@@ -19,6 +20,9 @@
</div> </div>
<div class="col-xs-12 col-md-6"> <div class="col-xs-12 col-md-6">
<h2>Rotations</h2> <h2>Rotations</h2>
<div>
Select rotation to edit:
</div>
<table class="table table-striped"> <table class="table table-striped">
<tr><th>Rotation</th><th>Select</th></tr> <tr><th>Rotation</th><th>Select</th></tr>
<tr ng-repeat="r in rotations"> <tr ng-repeat="r in rotations">
@@ -27,6 +31,7 @@
</tr> </tr>
</table> </table>
<h2>Rotation: {{selected_rot.name}}</h2> <h2>Rotation: {{selected_rot.name}}</h2>
<div>Instances in currently selected rotation:</div>
<table class="table table-striped"> <table class="table table-striped">
<tr><th>Instance</th><th>Duration</th><th>Delete</th></tr> <tr><th>Instance</th><th>Duration</th><th>Delete</th></tr>
<tr ng-repeat="i in selected_rot.instances"> <tr ng-repeat="i in selected_rot.instances">
members/static/css/simple-sidebar.css
+9 -9
View File
@@ -15,16 +15,16 @@
} }
#wrapper.toggled { #wrapper.toggled {
padding-left: 250px; padding-left: 200px;
} }
#sidebar-wrapper { #sidebar-wrapper {
z-index: 1000; z-index: 1000;
position: fixed; position: fixed;
left: 250px; left: 200px;
width: 0; width: 0;
height: 100%; height: 100%;
margin-left: -250px; margin-left: -200px;
overflow-y: auto; overflow-y: auto;
background: #000; background: #000;
-webkit-transition: all 0.5s ease; -webkit-transition: all 0.5s ease;
@@ -34,7 +34,7 @@
} }
#wrapper.toggled #sidebar-wrapper { #wrapper.toggled #sidebar-wrapper {
width: 250px; width: 200px;
} }
#page-content-wrapper { #page-content-wrapper {
@@ -45,7 +45,7 @@
#wrapper.toggled #page-content-wrapper { #wrapper.toggled #page-content-wrapper {
position: absolute; position: absolute;
margin-right: -250px; margin-right: -200px;
} }
/* Sidebar Styles */ /* Sidebar Styles */
@@ -53,7 +53,7 @@
.sidebar-nav { .sidebar-nav {
position: absolute; position: absolute;
top: 0; top: 0;
width: 250px; width: 200px;
margin: 0; margin: 0;
padding: 0; padding: 0;
list-style: none; list-style: none;
@@ -98,7 +98,7 @@
@media(min-width:768px) { @media(min-width:768px) {
#wrapper { #wrapper {
padding-left: 250px; padding-left: 200px;
} }
#wrapper.toggled { #wrapper.toggled {
@@ -106,7 +106,7 @@
} }
#sidebar-wrapper { #sidebar-wrapper {
width: 250px; width: 200px;
} }
#wrapper.toggled #sidebar-wrapper { #wrapper.toggled #sidebar-wrapper {
@@ -122,4 +122,4 @@
position: relative; position: relative;
margin-right: 0; margin-right: 0;
} }
} }
members/static/html/jasenlista.html
+2
View File
@@ -28,6 +28,8 @@
</td> </td>
<td> <td>
<a href="#/edit/{{x.id}}"<input type="button" value="Edit" class="btn btn-info">Muokkaa</input></a> <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?"/> <input type="button" value="Poista" class="btn btn-danger" confirmed-click="delete_member(x.id)" ng-confirm-click="Are you sure?"/>
</td> </td>
</tr> </tr>