Skip to content

yotta / pictogram

Go to a project
Commit a92a1cb4 by Sebastián Collado Montañez
Options

minor changes

parent 02c69e4c
Inline Side-by-side
Showing with 45 additions and 23 deletions
sails/src/assets/scripts/modules/student/controllers/collections.js
......@@ -541,7 +541,6 @@ dashboardControllers.controller('StudentCollectionsCtrl', function StudentCollec
* Modal window to open grid color config
*/
$scope.open_grid_color = function (grid) {
console.log(grid);
var modalInstance = $modal.open({
animation: true,
......
sails/src/assets/scripts/modules/student/views/gridconfig.html
......@@ -7,17 +7,30 @@
</div>
<div class="modal-body">
<div class="container-fluid">
<div class="form-group row">
<label for="favcolor" class="col-xs-3">Color de fondo</label>
<div class="col-xs-3">
<input type="color" class="form-control" value="{{gridColor}}" id="favcolor" ng-model="gridColor">
<div class="form-group">
<div class="row">
<label for="favcolor">Color de fondo</label>
</div>
<div class="row">
<div class="col-xs-3">
<input type="color" class="form-control" value="{{gridColor}}" ng-model="gridColor">
</div>
<div class="col-xs-3">
<button class="btn btn-danger pull-right" ng-click="close('#ffffff')">
<i class="fa fa-eraser" aria-hidden="true"></i> Eliminar color
</button>
</div>
<div class="col-xs-6">
<div class="alert alert-info" style="margin: 0 auto;" translate>
Color de fondo para el pictograma seleccionado
</div>
</div>
</div>
</div>
<div class="col-xs-6">
<button class="btn btn-default pull-right" ng-click="close('#ffffff')">Eliminar color</button>
</div>
</div>
</div>
</div>
<div class="modal-footer text-right">
......
sails/src/assets/scripts/modules/student/views/pictoconfig.html
......@@ -86,30 +86,40 @@
<div class="form-group">
<div class="row">
<label translate>Color de fondo</label><br/>
<label for="favcolor">Color de fondo</label>
</div>
<div class="row">
<div class="col-md-6">
Seleccione un color <input type="color" name="favcolor" value="{{studentPicto.attributes.color}}"
ng-init="studentPicto.attributes.color" ng-model="studentPicto.attributes.color"
style="width:20px;height:20px;">
<div class="col-xs-6">
<div class="row" style="margin-bottom:1em;">
<input type="color" class="form-control col-xs-12" value="{{studentPicto.attributes.color}}" ng-model="studentPicto.attributes.color">
</div>
<div class="row">
<button class="btn btn-danger col-xs-5" ng-click="close('#ffffff')" style="font-size:13px;">
<i class="fa fa-eraser" aria-hidden="true"></i> Eliminar color
</button>
<button class="btn btn-primary col-xs-6 col-xs-offset-1" ng-click="close('#ffffff')" style="font-size:13px;">
<i class="fa fa-clone" aria-hidden="true"></i> Copiar de tablero
</button>
</div>
</div>
<div class="col-md-6">
<div class="col-xs-6">
<div class="alert alert-info" style="margin: 0 auto;" translate>
Cambia el color de fondo para el pictograma seleccionado
Seleccione un color para el pictograma de forma manual o copiandolo desde su tablero asociado
</div>
</div>
</div>
</div>
<div class="col-xs-6">
<div class="row">
<div class="col-md-12">
<button class="btn btn-success pull-right" ng-click="save()" translate>save</button>
<button class="btn btn-secondary margin-right10 pull-right" ng-click="close()" translate>cancel</button>
</div>
</div>
</div>
</div>
</div><!-- /.modal-body -->
<div class="modal-footer">
<button class="btn btn-success pull-right" ng-click="save()" translate>save</button>
<button class="btn btn-secondary margin-right10 pull-right" ng-click="close()" translate>cancel</button>
</div>
</div>
</div>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment