Skip to content

Commit

Permalink
Add missing btn-flat class & few translate correction
Browse files Browse the repository at this point in the history
  • Loading branch information
C4rlit0 committed Feb 19, 2018
1 parent 1e1ab7c commit 70a666f
Show file tree
Hide file tree
Showing 15 changed files with 23 additions and 19 deletions.
3 changes: 3 additions & 0 deletions config/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@
"installation-role-habitant": "Habitant",
"installation-role-guest": "Guest",
"search-placeholder": "What can I do for you ?",
"Parameters":"Parameters",
"parameters-general": "General",
"parameters-house": "Houses",
"parameters-areas": "Areas",
Expand Down Expand Up @@ -186,6 +187,7 @@
"mode-description": "Description",
"mode-action": "Action",
"mode-delete": "Delete",
"mode-new": "New",
"token-description": "Token are keys allowing you to contact Gladys HTTP API remotely. For example, to get houses : GET http://GLADYS_URL/house?token=YOUR_TOKEN",
"parameters-param": "Parameters",
"param-box-title": "Parameters",
Expand Down Expand Up @@ -334,6 +336,7 @@
"box-calendar-title": "Calendar",
"box-weather-title": "Weather",
"box-event-title": "Event",
"box-event-create": "Create",
"box-camera-title": "Camera",
"box-camera-explanation": "Enter here the URL of the image/video flux :",
"box-camera-tutorial": "Tutorial example :",
Expand Down
3 changes: 2 additions & 1 deletion config/locales/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"Scenarios":"Scénarios",
"Sensors":"Capteurs",
"Calendar":"Calendrier",
"Parametres":"Paramètres",
"Parameters":"Paramètres",
"Search":"Faire une recherche",
"View All":"Voir toutes",
"You have":"Vous avez",
Expand Down Expand Up @@ -495,6 +495,7 @@
"box-calendar-title": "Calendrier",
"box-weather-title": "Météo",
"box-event-title": "Event",
"box-event-create": "Créer",
"box-camera-title": "Camera",
"box-camera-explanation": "Entrez ici l'URL de votre image ou de votre flux vidéo :",
"box-camera-tutorial": "Exemple de tutoriel :",
Expand Down
2 changes: 1 addition & 1 deletion views/boxs/camera.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<input class="form-control" type="text" ng-model="vm.newCameraUrl" placeholder="<%= __('box-camera-placeholder') %>"/>
</div>
<div class="col-md-2">
<button class="btn btn-success" ng-click="vm.saveCameraUrl(vm.newCameraUrl);"><%= __('box-camera-validate') %></button>
<button class="btn btn-success btn-flat" ng-click="vm.saveCameraUrl(vm.newCameraUrl);"><%= __('box-camera-validate') %></button>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion views/boxs/event.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<div class="col-md-4"> <select ng-model="vm.newEvent.house" class="form-control"><option ng-repeat="house in vm.houses" value="{{house.id}}">{{house.name}}</option> </select> </div>
</div>
<div class="row" style="margin-top:20px;">
<div class="col-md-12"> <button class="btn btn-block btn-success" ng-click="vm.createEvent(vm.newEvent);">Créer</button></div>
<div class="col-md-12"> <button class="btn btn-block btn-success btn-flat" ng-click="vm.createEvent(vm.newEvent);"><%= __('box-event-create') %></button></div>
</div>
</div>
<!-- /.box-body -->
Expand Down
2 changes: 1 addition & 1 deletion views/boxs/mode.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
</div>
</div>
<div class="row" style="margin-top:20px;">
<div class="col-md-12"> <button class="btn btn-block btn-success" ng-click="vm.changeMode(vm.newMode);">
<div class="col-md-12"> <button class="btn btn-block btn-success btn-flat" ng-click="vm.changeMode(vm.newMode);">
<%= __('box-mode-validate') %>
</button>
</div>
Expand Down
10 changes: 5 additions & 5 deletions views/boxs/music.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
<center>{{vm.currentTrack.title}} - {{vm.currentTrack.artist}}</center>
</div>
<div class="row" style="margin-bottom: 20px">
<div class="col-xs-offset-4 col-xs-1"> <button ng-click="vm.previous();" class="btn btn-default"><i class="fa fa-fast-backward"></i></button> </div>
<div class="col-xs-1"> <button ng-click="vm.stop();" class="btn btn-default"><i class="fa fa-stop"></i></button> </div>
<div class="col-xs-1"> <button ng-show="vm.playing" ng-click="vm.pause();" class="btn btn-default"><i class="fa fa-pause"></i></button> <button ng-show="!vm.playing" ng-click="vm.play();" class="btn btn-default"><i class="fa fa-play"></i></button> </div>
<div class="col-xs-1"> <button ng-click="vm.next();" class="btn btn-default"><i class="fa fa-fast-forward"></i></button> </div>
<div class="col-xs-offset-4 col-xs-1"> <button ng-click="vm.previous();" class="btn btn-default btn-flat"><i class="fa fa-fast-backward"></i></button> </div>
<div class="col-xs-1"> <button ng-click="vm.stop();" class="btn btn-default btn-flat"><i class="fa fa-stop"></i></button> </div>
<div class="col-xs-1"> <button ng-show="vm.playing" ng-click="vm.pause();" class="btn btn-default btn-flat"><i class="fa fa-pause"></i></button> <button ng-show="!vm.playing" ng-click="vm.play();" class="btn btn-default btn-flat"><i class="fa fa-play"></i></button> </div>
<div class="col-xs-1"> <button ng-click="vm.next();" class="btn btn-default btn-flat"><i class="fa fa-fast-forward"></i></button> </div>
</div>
<div class="table-responsive" ng-show="vm.queue && vm.queue.length" style="height: 200px; overflow:auto;">
<table class="table ">
Expand All @@ -43,7 +43,7 @@
<option ng-repeat="room in vm.rooms" value="{{room.id}}">{{room.name}}</option>
</select>
</div>
<div class="col-xs-2"> <button class="btn btn-success" ng-click="vm.selectRoomId(vm.selectedRoomId);"><%= __('box-music-music-validate') %></button>
<div class="col-xs-2"> <button class="btn btn-success btn-flat" ng-click="vm.selectRoomId(vm.selectedRoomId);"><%= __('box-music-music-validate') %></button>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion views/boxs/who-is-at-home.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</select>
</div>
<div class="col-md-2">
<button class="btn btn-success" ng-click="vm.saveHouse(vm.newHouseId);"><%= __('box-who-is-at-home-validate') %></button>
<button class="btn btn-success btn-flat" ng-click="vm.saveHouse(vm.newHouseId);"><%= __('box-who-is-at-home-validate') %></button>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion views/layout.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@
</li>
<li id="parametreLi" class="treeview">
<a href="/dashboard/parametres">
<i class="fa fa-gear"></i> <span><%= __('Parametres') %></span>
<i class="fa fa-gear"></i> <span><%= __('Parameters') %></span>
</a>
</li>

Expand Down
2 changes: 1 addition & 1 deletion views/module/index.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@
</div>
</div>
<div class="modal-footer">
<button type="button" id="validateButton" class="btn btn-primary" data-dismiss="modal">Ok</button>
<button type="button" id="validateButton" class="btn btn-primary btn-flat" data-dismiss="modal">Ok</button>
</div>
</div>
<!-- /.modal-content -->
Expand Down
4 changes: 2 additions & 2 deletions views/parametres/index.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
<!-- Content Header (Page header) -->
<section class="content-header">
<h1>
<%= __('Parametres') %>
<%= __('Parameters') %>
<small><%= __('Control Panel') %></small>
</h1>
<ol class="breadcrumb">
<li><p><i class="fa fa-dashboard"></i> <%= __('Home') %></p></li>
<li class="active"><%= __('Parametres') %></li>
<li class="active"><%= __('Parameters') %></li>
</ol>
</section>

Expand Down
2 changes: 1 addition & 1 deletion views/partials/areas.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<td><input type="text" class="form-control" ng-model="vm.newArea.latitude" data-toggle="tooltip" data-original-title="<%= __('tooltip-area-latitude') %>" /></td>
<td><input type="text" class="form-control" ng-model="vm.newArea.longitude" data-toggle="tooltip" data-original-title="<%= __('tooltip-area-longitude') %>" /></td>
<td><input type="text" class="form-control" ng-model="vm.newArea.radius" data-toggle="tooltip" data-original-title="<%= __('tooltip-area-radius') %>" /></td>
<td><button class="btn btn-success btn-sm" ng-click="vm.createArea(vm.newArea)"><%= __('area-new') %></button></td>
<td><button class="btn btn-success btn-flat btn-sm" ng-click="vm.createArea(vm.newArea)"><%= __('area-new') %></button></td>
</tr>
</tbody>
</table>
Expand Down
2 changes: 1 addition & 1 deletion views/partials/boxconfig.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
</td>
<td><input type="text" ng-model="vm.newBox.y"class="form-control" placeholder="y" data-toggle="tooltip" data-original-title="<%= __('tooltip-box-y') %>" /></td>
<td><input type="text" disabled ng-model="vm.newBox.active"class="form-control" value="1" /></td>
<td><button class="btn btn-success btn-sm" ng-click="vm.create(vm.newBox)"><%= __('New') %></button></td>
<td><button class="btn btn-success btn-flat btn-sm" ng-click="vm.create(vm.newBox)"><%= __('New') %></button></td>
</tr>
</tbody>
</table>
Expand Down
2 changes: 1 addition & 1 deletion views/partials/houses.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<td><input type="text" class="form-control" ng-model="vm.newHouse.country" data-toggle="tooltip" data-original-title="<%= __('tooltip-house-country') %>" /></td>
<td><input type="text" class="form-control" ng-model="vm.newHouse.latitude" data-toggle="tooltip" data-original-title="<%= __('tooltip-house-latitude') %>" /></td>
<td><input type="text" class="form-control" ng-model="vm.newHouse.longitude" data-toggle="tooltip" data-original-title="<%= __('tooltip-house-longitude') %>" /></td>
<td><button class="btn btn-success btn-sm" ng-click="vm.createHouse(vm.newHouse)"><%= __('New') %></button></td>
<td><button class="btn btn-success btn-flat btn-sm" ng-click="vm.createHouse(vm.newHouse)"><%= __('New') %></button></td>
</tr>
</tbody>
</table>
Expand Down
2 changes: 1 addition & 1 deletion views/partials/modes.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<td><input type="text" class="form-control" ng-model="vm.newMode.code" data-toggle="tooltip" data-original-title="<%= __('tooltip-mode-code') %>" /></td>
<td><input type="text" class="form-control" ng-model="vm.newMode.name" data-toggle="tooltip" data-original-title="<%= __('tooltip-mode-name') %>" /></td>
<td><input type="text" class="form-control" ng-model="vm.newMode.description" data-toggle="tooltip" data-original-title="<%= __('tooltip-mode-description') %>" /></td>
<td><button class="btn btn-success btn-sm" ng-click="vm.createMode(vm.newMode)"><%= __('mode-new') %></button></td>
<td><button class="btn btn-success btn-flat btn-sm" ng-click="vm.createMode(vm.newMode)"><%= __('mode-new') %></button></td>
</tr>
</tbody>
</table>
Expand Down
2 changes: 1 addition & 1 deletion views/partials/notifications.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

</td>
<td><input type="text" class="form-control" ng-model="vm.newNotificationUser.priority" data-toggle="tooltip" data-original-title="<%= __('tooltip-notification-priority') %>" /></td>
<td><button class="btn btn-success btn-sm" ng-click="vm.createNotificationUser(vm.newNotificationUser)"><%= __('notification-new') %></button></td>
<td><button class="btn btn-success btn-flat btn-sm" ng-click="vm.createNotificationUser(vm.newNotificationUser)"><%= __('notification-new') %></button></td>
</tr>
</tbody>
</table>
Expand Down

0 comments on commit 70a666f

Please sign in to comment.