Skip to content

yotta / pictogram

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

methods interface done

parent feff5acb
Inline Side-by-side
Showing with 251 additions and 169 deletions
sails/src/assets/app/i18n/en-gb.json
...@@ -164,7 +164,9 @@ ...@@ -164,7 +164,9 @@
"input_selection": "How to place a pictogram", "input_selection": "How to place a pictogram",
"instruction": "Instruction", "instruction": "Instruction",
"instruction_begin": "Begin instruction", "instruction_begin": "Begin instruction",
"instruction_objetive": "Instruction objetive description",
"instruction_end": "End instruction", "instruction_end": "End instruction",
"instruction_name": "Instruction name",
"instructions": "Instructions", "instructions": "Instructions",
"instructions_sent": "Instructions have been sent to your email address. Please, check your inbox.", "instructions_sent": "Instructions have been sent to your email address. Please, check your inbox.",
"invalid_fields": "Invalid values. Please, check fields introduced.", "invalid_fields": "Invalid values. Please, check fields introduced.",
...@@ -214,6 +216,8 @@ ...@@ -214,6 +216,8 @@
"max_expression": "Expression must be a maximun of 11-12 characters.", "max_expression": "Expression must be a maximun of 11-12 characters.",
"max_licenses_reached": "Maximum number of licenses reached by the office", "max_licenses_reached": "Maximum number of licenses reached by the office",
"May": "May", "May": "May",
"method_description": "Method description",
"method_name": "Method name",
"method_name_duplicated": "Template '{{method_name}}' already exists", "method_name_duplicated": "Template '{{method_name}}' already exists",
"method_saved": "'{{method_name}}' saved as a new template", "method_saved": "'{{method_name}}' saved as a new template",
"methods": "Methods", "methods": "Methods",
...@@ -353,6 +357,8 @@ ...@@ -353,6 +357,8 @@
"setup": "Setup", "setup": "Setup",
"sexo": "Sex", "sexo": "Sex",
"show": "Show", "show": "Show",
"show_all": "Show all",
"show_less": "Show less details",
"size": "Size", "size": "Size",
"small": "Small", "small": "Small",
"small_picto": "Small pictograms", "small_picto": "Small pictograms",
......
sails/src/assets/app/i18n/es-es.json
...@@ -164,7 +164,9 @@ ...@@ -164,7 +164,9 @@
"input_selection": "Cómo colocar un pictograma", "input_selection": "Cómo colocar un pictograma",
"instruction": "Instrucción", "instruction": "Instrucción",
"instruction_begin": "Primer intento", "instruction_begin": "Primer intento",
"instruction_objetive": "Descripción del objetivo de la instrucción",
"instruction_end": "Último intento", "instruction_end": "Último intento",
"instruction_name": "Nombre de la instrucción",
"instructions": "Instrucciones", "instructions": "Instrucciones",
"instructions_sent": "Se le han enviado instrucciones a su dirección de correo electrónico. Por favor, compruebe su buzón.", "instructions_sent": "Se le han enviado instrucciones a su dirección de correo electrónico. Por favor, compruebe su buzón.",
"invalid_fields": "Valores inválidos. Compruebe los datos introducidos.", "invalid_fields": "Valores inválidos. Compruebe los datos introducidos.",
...@@ -214,6 +216,8 @@ ...@@ -214,6 +216,8 @@
"max_expression": "La expresión debe tener un máximo de 11-12 caracteres.", "max_expression": "La expresión debe tener un máximo de 11-12 caracteres.",
"max_licenses_reached": "Número de licencias máximo alcanzado por la oficina", "max_licenses_reached": "Número de licencias máximo alcanzado por la oficina",
"May": "Mayo", "May": "Mayo",
"method_description": "Descripción del método",
"method_name": "Nombre del método",
"method_name_duplicated": "La plantilla '{{method_name}}' ya existe", "method_name_duplicated": "La plantilla '{{method_name}}' ya existe",
"method_saved": "'{{method_name}}' guardado como nueva plantilla", "method_saved": "'{{method_name}}' guardado como nueva plantilla",
"methods": "Métodos", "methods": "Métodos",
...@@ -353,6 +357,8 @@ ...@@ -353,6 +357,8 @@
"setup": "Configuración", "setup": "Configuración",
"sexo": "Sexo", "sexo": "Sexo",
"show": "Mostrar", "show": "Mostrar",
"show_all": "Ver todo",
"show_less": "Ver menos detalles",
"size": "Tamaño", "size": "Tamaño",
"small": "Pequeño", "small": "Pequeño",
"small_picto": "Pictogramas pequeños", "small_picto": "Pictogramas pequeños",
......
sails/src/assets/scripts/modules/student/controllers/instructions.js
...@@ -318,4 +318,13 @@ dashboardControllers.controller('StudentInstructionsCtrl', function StudentInstr ...@@ -318,4 +318,13 @@ dashboardControllers.controller('StudentInstructionsCtrl', function StudentInstr
}; };
// End Modal window to view instruction details // End Modal window to view instruction details
//Display method
$scope.minimalMode = false;
$scope.enable_minimal = function(){
$scope.minimalMode = !$scope.minimalMode;
};
}); });
sails/src/assets/scripts/modules/student/views/instructiondetail.html
...@@ -25,15 +25,15 @@ ...@@ -25,15 +25,15 @@
<div class="form-group"> <div class="form-group">
<label for="ins_begin" class="col-sm-2 control-label" translate>instruction_begin</label> <label for="ins_begin" class="col-sm-2 control-label" translate>instruction_begin</label>
<div class="col-sm-10 padding8"> <div class="col-sm-10 padding8">
<span class="color_blue">{{ instruction.begin | date:"dd-MM-yyyy" }}</span> <span class="color_blue">{{ instruction.begin | date:"dd-MM-yyyy" }}</span>
{{ instruction.begin | date:"HH:mm:ss" }} {{ instruction.begin | date:"HH:mm:ss" }}
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="ins_end" class="col-sm-2 control-label" translate>instruction_end Último intento</label> <label for="ins_end" class="col-sm-2 control-label" translate>instruction_end</label>
<div class="col-sm-10 padding8"> <div class="col-sm-10 padding8">
<span class="color_blue">{{ instruction.end | date:"dd-MM-yyyy" }}</span> <span class="color_blue">{{ instruction.end | date:"dd-MM-yyyy" }}</span>
{{ instruction.end | date:"HH:mm:ss" }} {{ instruction.end | date:"HH:mm:ss" }}
</div> </div>
</div> </div>
...@@ -41,22 +41,22 @@ ...@@ -41,22 +41,22 @@
<div class="form-group"> <div class="form-group">
<label for="ins_status" class="col-sm-2 control-label" translate>state</label> <label for="ins_status" class="col-sm-2 control-label" translate>state</label>
<div class="col-sm-10 padding8"> <div class="col-sm-10 padding8">
<span id="ins_status" class="pointer text_medium glyphicon" ng-class="{ <span id="ins_status" class="pointer text_medium glyphicon" ng-class="{
'color_green': instruction.status == 'finished', 'color_green': instruction.status == 'finished',
'glyphicon-check': instruction.status == 'finished', 'glyphicon-check': instruction.status == 'finished',
'color_blue': instruction.status == 'started', 'color_blue': instruction.status == 'started',
'glyphicon-edit': instruction.status == 'started', 'glyphicon-edit': instruction.status == 'started',
'glyphicon-minus': instruction.status == null 'glyphicon-minus': instruction.status == null
}" aria-hidden="true" popover="{{(instruction.status || 'nobegin') | translate}}" popover-trigger="mouseenter"></span> }" aria-hidden="true" popover="{{(instruction.status || 'nobegin') | translate}}" popover-trigger="mouseenter"></span>
</div> </div>
</div> </div>
</form> </form>
</div> </div>
<!-- End modal-body --> <!-- End modal-body -->
<div class="modal-footer"> <div class="modal-footer">
<button class="btn btn-primary" ng-click="close()" translate>close</button> <button class="btn btn-primary" ng-click="close()" translate>close</button>
</div> </div>
</div> </div>
\ No newline at end of file
sails/src/assets/scripts/modules/student/views/instructions.html
...@@ -3,109 +3,149 @@ ...@@ -3,109 +3,149 @@
<div class="panel panel-default student_tab_panel"> <div class="panel panel-default student_tab_panel">
<div class="panel-body"> <div class="panel-body">
<!-- Select to add new method --> <div class="row">
<div class="form-group"> <div class="col-sm-6">
<select class="form-control" name="method_select" id="method_select" ng-model="method_selected"> <!-- Select to add new method -->
<option value="" translate>select_method</option> <div class="form-group">
<option ng-repeat="ma in methods_available track by $index" <select class="form-control" name="method_select" id="method_select" ng-model="method_selected">
ng-value="ma.id" <option value="" translate>select_method</option>
label="{{ ma.name }}" <option ng-repeat="ma in methods_available track by $index"
ng-if="ma.lang == user.lang"> ng-value="ma.id"
{{ ma.name }} label="{{ ma.name }}"
</option> ng-if="ma.lang == user.lang">
<option value="0" translate>new_method</option> {{ ma.name }}
</select> </option>
<option value="0" translate>new_method</option>
</select>
<!-- Botón añadir método -->
<button ng-click="add_method()" class="btn btn-success btn-sm" popover="{{ 'add' | translate }}" popover-trigger="mouseenter" ng-disabled="method_selected == undefined">
<span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
</button>
<!-- Botón eliminar plantilla -->
<button ng-click="delete_template()" class="btn btn-danger btn-sm" popover="{{ 'delete_template' | translate }}" popover-trigger="mouseenter" ng-show="method_selected.supervisor == user.id">
<span class="glyphicon glyphicon-minus" aria-hidden="true"></span>
</button>
</div>
</div>
<!-- Botón añadir método --> <div class="col-sm-6 text-right" ng-if="!minimalMode">
<button ng-click="add_method()" class="btn btn-success btn-sm" popover="{{ 'add' | translate}}" popover-trigger="mouseenter" ng-disabled="method_selected == undefined"> <button class="btn btn-primary" ng-click="enable_minimal()"><i class="fa fa-eye-slash" aria-hidden="true"></i> {{ 'show_less' | translate }}</button>
<span class="glyphicon glyphicon-plus" aria-hidden="true"></span> </div>
</button> <div class="col-sm-6 text-right" ng-if="minimalMode">
<button class="btn btn-primary" ng-click="enable_minimal()"><i class="fa fa-eye" aria-hidden="true"></i> {{'show_all' | translate }}</button>
</div>
<!-- Botón eliminar plantilla --> </div>
<button ng-click="delete_template()" class="btn btn-danger btn-sm" popover="{{ 'delete_template' | translate}}" popover-trigger="mouseenter" ng-show="method_selected.supervisor == user.id">
<span class="glyphicon glyphicon-minus" aria-hidden="true"></span>
</button>
</div>
<!-- END select to add new method --> <!-- END select to add new method -->
<!-- Method instructions --> <!-- Methods -->
<div class="method" ng-repeat="m in methods"> <div class="method" ng-repeat="m in methods">
<!-- Method header -->
<div class="method-header"> <div class="method-header">
<div class="col-sm-6"> <div class="col-sm-6">
<input type="text" class="editable title" ng-model="m.name " ng-blur="update_method(m)"/> <input type="text" class="editable lead" ng-model="m.name" ng-blur="update_method(m)" placeholder="{{ 'method_name' | translate }}">
</div> </div>
<div class="col-sm-6 text-right"> <div class="col-sm-1 col-sm-offset-5 text-center">
<div class="options"> <div class="options">
<a ng-click="save_as_template(m)" popover="{{ 'save_as_template' | translate}}" popover-trigger="mouseenter"><span class="text_medium color_black glyphicon glyphicon-floppy-disk options-button" aria-hidden="true"></span></a> <a ng-click="save_as_template(m)" popover="{{ 'save_as_template' | translate }}" popover-trigger="mouseenter" style="text-decoration:none">
<a ng-click="delete_method(m)" popover="{{ 'delete' | translate}}" popover-trigger="mouseenter"><span class="text_medium color_red glyphicon glyphicon-remove-circle options-button" aria-hidden="true"></span></a> <span class="text_medium color_black glyphicon glyphicon-floppy-disk options-button" aria-hidden="true"></span>
</a>
&nbsp;
<a ng-click="delete_method(m)" popover="{{ 'delete' | translate }}" popover-trigger="mouseenter">
<span class="text_medium color_red glyphicon glyphicon-remove-circle options-button" aria-hidden="true" style="text-decoration:none"></span>
</a>
</div> </div>
</div> </div>
</div> </div>
<!--END Method header -->
<div class="container-fluid"> <!-- Method body -->
<textarea class="editable" ng-model="m.description " placeholder="{{'description' | translate}}" ng-blur="update_method(m)"></textarea> <div class="method-body">
</div>
<!-- Tabla método --> <!-- Method description -->
<table class="table_instructions table"> <div class="container-fluid" ng-if="!minimalMode">
<tr> <div class="instruction-data">
<th></th> <textarea class="editable" ng-model="m.description " placeholder="{{ 'method_description' | translate }}" ng-blur="update_method(m)" rows="3"></textarea>
<th translate>instruction</th> </div>
<th translate>objetive</th> </div>
<th class="text-center" translate>instruction_begin</th> <!--END Method description -->
<th class="text-center" translate>instruction_end</th>
<th class="text-center" translate>state</th> <br ng-if="!minimalMode">
<th></th>
</tr> <!-- Instructions table -->
<tr ng-repeat="i in m.instructions"> <table class="table">
<td> <thead class="thead-default">
<a ng-click="open_instruction(i)"><span class="glyphicon glyphicon-file text_medium" aria-hidden="true"></span></a> <tr>
</td> <th></th>
<td><input class="editable" type="text" ng-model="i.name" ng-blur="update_instruction(i)" /></td> <th class="text-center" translate>instructions</th>
<td><textarea class="elipsis editable" type="text" ng-model="i.objective" ng-blur="update_instruction(i)"></textarea></td> <th class="text-center" translate>instruction_begin</th>
<td> <th class="text-center" translate>instruction_end</th>
<div class="text-center"> <th class="text-center" translate>state</th>
<span class="color_blue">{{ i.begin | date:"dd-MM-yyyy" }}</span> <th></th>
<br> </tr>
{{ i.begin | date:"HH:mm:ss" }} </thead>
</div> <tbody>
</td> <tr ng-repeat="i in m.instructions">
<td> <td>
<div class="text-center" ng-class="{ color_green : i.id == m.last_ins }"> <a ng-click="open_instruction(i)"><span class="glyphicon glyphicon-file text_medium" aria-hidden="true"></span></a>
<span ng-class="{ color_green : i.id == m.last_ins, color_blue : i.id != m.last_ins }">{{ i.end | date:"dd-MM-yyyy" }}</span> </td>
<br> <td>
{{ i.end | date:"HH:mm:ss" }} <dl>
</div> <dt translate>instruction</dt>
</td> <dd><div class="instruction-data"><input class="editable" type="text" ng-model="i.name" ng-blur="update_instruction(i)" placeholder="{{ 'instruction_name' | translate }}"></div></dd>
<td class="editable_status"> <dt ng-if="!minimalMode" translate>objetive</dt>
<span class="pointer text_medium glyphicon" ng-class="{ <dd ng-if="!minimalMode"><div class="instruction-data"><textarea class="elipsis editable" type="text" ng-model="i.objective" ng-blur="update_instruction(i)" rows="3" placeholder="{{ 'instruction_objetive' | translate }}"></textarea></div></dd>
'color_green': i.status == 'finished', </dl>
'glyphicon-check': i.status == 'finished', </td>
'color_blue': i.status == 'started', <td>
'glyphicon-edit': i.status == 'started', <div class="text-center">
'glyphicon-minus': i.status == null <span class="color_blue">{{ i.begin | date:"dd-MM-yyyy" }}</span>
}" aria-hidden="true" popover="{{(i.status || 'nobegin') | translate}}" popover-trigger="mouseenter" ng-click="change_status(i)"></span> <br>
</td> {{ i.begin | date:"HH:mm:ss" }}
<td> </div>
<a confirmed-click="delete_instruction(i);" ng-confirm-click="{{ 'confirmation' | translate}}" class="delete_instruction"> </td>
<span class="text_medium delete color_red glyphicon glyphicon-remove-circle options-button" aria-hidden="true"></span> <td>
<div class="text-center" ng-class="{ color_green : i.id == m.last_ins }">
<span ng-class="{ color_green : i.id == m.last_ins, color_blue : i.id != m.last_ins }">{{ i.end | date:"dd-MM-yyyy" }}</span>
<br>
{{ i.end | date:"HH:mm:ss" }}
</div>
</td>
<td class="text-center">
<span class="pointer text_medium glyphicon" ng-class="{
'color_green': i.status == 'finished',
'glyphicon-check': i.status == 'finished',
'color_blue': i.status == 'started',
'glyphicon-edit': i.status == 'started',
'glyphicon-minus': i.status == null
}" aria-hidden="true" popover="{{(i.status || 'nobegin') | translate}}" popover-trigger="mouseenter" ng-click="change_status(i)"></span>
</td>
<td>
<a confirmed-click="delete_instruction(i);" ng-confirm-click="{{ 'confirmation' | translate}}" class="delete_instruction" popover="{{ 'delete' | translate }}" popover-trigger="mouseenter" style="text-decoration:none">
<span class="text_medium color_red glyphicon glyphicon-remove-circle options-button" aria-hidden="true"></span>
</a>
</td>
</tr>
</tbody>
</table>
<!--END Instructions table -->
<!-- Add instruction -->
<div class="container-fluid text-right" ng-if="!minimalMode">
<p>
<a ng-click="add_instruction(m)" class="add_instruction btn btn-success btn-sm" role="button">
<span class="glyphicon glyphicon-plus" aria-hidden="true"></span> {{ 'add_instruction' | translate }}
</a> </a>
</td> </p>
</tr> </div>
</table> <!--END Add instruction -->
<!-- Añadir instrucción al método -->
<div class="container-fluid text-right">
<p>
<a ng-click="add_instruction(m)" class="add_instruction btn btn-success btn-sm" role="button">
<span class="glyphicon glyphicon-plus" aria-hidden="true"></span> {{ 'add_instruction' | translate }}
</a>
</p>
</div> </div>
<!--END Method body -->
</div> </div>
<!-- Fin de .method --> <!-- END methods -->
</div> </div>
......
sails/src/assets/scripts/modules/supervisor/controllers/instructions.js
...@@ -158,4 +158,11 @@ dashboardControllers.controller('InstructionsCtrl', function InstructionsCtrl($s ...@@ -158,4 +158,11 @@ dashboardControllers.controller('InstructionsCtrl', function InstructionsCtrl($s
}); });
}; };
//Display method
$scope.minimalMode = false;
$scope.enable_minimal = function(){
$scope.minimalMode = !$scope.minimalMode;
};
}); });
sails/src/assets/scripts/modules/supervisor/views/instructions.html
...@@ -4,55 +4,92 @@ ...@@ -4,55 +4,92 @@
<div class="panel-heading"><h3 class="panel-title" translate>own_instructions</h3></div> <div class="panel-heading"><h3 class="panel-title" translate>own_instructions</h3></div>
<div class="panel-body"> <div class="panel-body">
<!-- Select to add new method -->
<div class="form-group">
<!-- Botón añadir método --> <div class="row">
<button ng-click="add_method()" class="btn btn-success btn-sm" popover="{{ 'add' | translate}}" popover-trigger="mouseenter"> <div class="col-sm-6">
<span class="glyphicon glyphicon-plus" aria-hidden="true"></span> <span translate>new_method</span> <!-- Select to add new method -->
</button> <div class="form-group">
<!-- Botón añadir método -->
<button ng-click="add_method()" class="btn btn-success btn-sm" popover="{{ 'add' | translate }}" popover-trigger="mouseenter">
<span class="glyphicon glyphicon-plus" aria-hidden="true"></span> <span translate>new_method</span>
</button>
</div>
</div>
</div> <div class="col-sm-6 text-right" ng-if="!minimalMode">
<!-- END select to add new method --> <button class="btn btn-primary" ng-click="enable_minimal()"><i class="fa fa-eye-slash" aria-hidden="true"></i> Ver menos detalles</button>
</div>
<div class="col-sm-6 text-right" ng-if="minimalMode">
<button class="btn btn-primary" ng-click="enable_minimal()"><i class="fa fa-eye" aria-hidden="true"></i> Ver todo</button>
</div>
</div>
<!-- Method instructions --> <!-- Method instructions -->
<div class="method" ng-repeat="m in methods"> <div class="method" ng-repeat="m in methods">
<!-- Method header -->
<div class="method-header"> <div class="method-header">
<div class="col-sm-6"> <div class="col-sm-6">
<input type="text" class="editable title" ng-model="m.name " ng-blur="update_method(m)"/> <input type="text" class="editable lead" ng-model="m.name " ng-blur="update_method(m)"/>
</div>
<div class="col-sm-1 col-sm-offset-5 text-center">
<div class="options">
<a ng-click="delete_method(m)" popover="{{ 'delete' | translate }}" popover-trigger="mouseenter" style="text-decoration:none">
<span class="text_medium color_red glyphicon glyphicon-remove-circle options-button" aria-hidden="true"></span>
</a>
</div>
</div> </div>
<div class="col-sm-6 text-right">
<a ng-click="delete_method(m)" popover="{{ 'delete' | translate}}" popover-trigger="mouseenter"><span class="text_medium delete color_red glyphicon glyphicon-remove-circle options-button" aria-hidden="true"></span></a>
</div>
</div> </div>
<!--END Method header -->
<textarea class="editable" ng-model="m.description " placeholder="{{'description' | translate}}" ng-blur="update_method(m)"></textarea> <!-- Method description -->
<div class="container-fluid" ng-if="!minimalMode">
<!-- Tabla método --> <div class="instruction-data">
<table class="table_instructions table"> <textarea class="editable" ng-model="m.description " placeholder="{{'description' | translate }}" ng-blur="update_method(m)"></textarea>
<tr> </div>
<th translate>instruction</th> </div>
<th translate>objetive</th> <!--END Method description -->
<th></th>
</tr> <br ng-if="!minimalMode">
<tr ng-repeat="i in m.metainstructions">
<td><input class="editable" type="text" ng-model="i.name" ng-blur="update_instruction(i)" /></td> <!-- Instructions table -->
<td><input class="elipsis editable" type="text" ng-model="i.objective" ng-blur="update_instruction(i)" /></td> <table class="table">
<td><a confirmed-click="delete_instruction(i);" ng-confirm-click="{{ 'confirmation' | translate}}" class="delete_instruction"><span class="text_medium delete color_red glyphicon glyphicon-remove-circle options-button" aria-hidden="true"></span></a></td> <thead class="thead-default">
</tr> <tr>
<th class="text-center" translate>instructions</th>
<th></th>
</tr>
</thead>
<tbody>
<tr ng-repeat="i in m.metainstructions">
<td>
<dl>
<dt translate>instruction</dt>
<dd><div class="instruction-data"><input class="editable" type="text" ng-model="i.name" ng-blur="update_instruction(i)" placeholder="{{ 'instruction_name' | translate }}"></div></dd>
<dt ng-if="!minimalMode" translate>objetive</dt>
<dd ng-if="!minimalMode"><div class="instruction-data"><textarea class="elipsis editable" type="text" ng-model="i.objective" ng-blur="update_instruction(i)" rows="3" placeholder="{{ 'instruction_objetive' | translate }}"></textarea></div></dd>
</dl>
</td>
<td>
<a confirmed-click="delete_instruction(i);" ng-confirm-click="{{ 'confirmation' | translate}}" class="delete_instruction" popover="{{ 'delete' | translate }}" popover-trigger="mouseenter" style="text-decoration:none">
<span class="text_medium color_red glyphicon glyphicon-remove-circle options-button" aria-hidden="true"></span>
</a>
</td>
</tr>
</tbody>
</table> </table>
<!-- Añadir instrucción al método --> <!-- Añadir instrucción al método -->
<p class="text-right"> <div class="container-fluid text-right" ng-if="!minimalMode">
<a ng-click="add_instruction(m)" class="add_instruction btn btn-success btn-sm" role="button"> <p>
<span class="glyphicon glyphicon-plus" aria-hidden="true"></span> {{ 'add_instruction' | translate }} <a ng-click="add_instruction(m)" class="add_instruction btn btn-success btn-sm" role="button">
</a> <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> {{ 'add_instruction' | translate }}
</p> </a>
</p>
</div>
</div> </div>
<!-- Fin de .method --> <!-- Fin de .method -->
</div> </div>
<!-- END .panel-body --> <!-- END .panel-body -->
</div> </div>
......
sails/src/assets/styles/main.css
...@@ -257,14 +257,20 @@ tr:hover .ops a{ ...@@ -257,14 +257,20 @@ tr:hover .ops a{
/* Panel Instrucciones */ /* Panel Instrucciones */
#method_select{
max-width: 300px;
display: inline-block;
padding-top: 2px;
}
.method-header { .method-header {
background-color: #F5F5F3; background-color: #F5F5F3;
padding: 5px; padding: 5px;
min-height: 45px; height: 52px;
margin-bottom: 5px; margin-bottom: 5px;
border-top-left-radius: 5px; border-top-left-radius: 5px;
border-top-right-radius: 5px; border-top-right-radius: 5px;
border-bottom: 1px solid #DDDDDD; border-bottom: 3px solid #DDDDDD;
} }
.method { .method {
...@@ -273,14 +279,16 @@ tr:hover .ops a{ ...@@ -273,14 +279,16 @@ tr:hover .ops a{
border: 1px solid #DDDDDD; border: 1px solid #DDDDDD;
} }
#method_select{ .thead-default {
max-width: 300px; background-color: #f5f5f3;
display: inline-block; }
padding-top: 2px;
.instruction-data {
width: 700px;
} }
.options { .options {
padding-top: 7px; padding-top: 10px;
} }
.options-button{ .options-button{
...@@ -294,10 +302,6 @@ tr:hover .ops a{ ...@@ -294,10 +302,6 @@ tr:hover .ops a{
font-size: 20px; font-size: 20px;
} }
.editable_status{
text-align: center;
}
.date_span{ .date_span{
display: inline-block; display: inline-block;
width: 40px; width: 40px;
...@@ -306,57 +310,31 @@ tr:hover .ops a{ ...@@ -306,57 +310,31 @@ tr:hover .ops a{
} }
/* Celdas con input para editar */ /* Celdas con input para editar */
td.editable{
padding: 0px !important;
height: 40px;
}
td.editable input{
width: 100%;
height: 100%;
border: none;
background: none;
padding: 0 6px;
}
.elipsis{ .elipsis{
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
input.editable{ .editable{
/*min-width: 400px;*/ border: 1px solid #f5f5f3;
border-radius: 5px;
background: transparent;
width: 100%; width: 100%;
border: none;
background: none;
padding: 6px; padding: 6px;
} }
.editable:focus { .editable:focus {
border-width: 0px;
border-style: solid;
border-radius: 5px;
outline: none;
border-color: #9ecaed; border-color: #9ecaed;
box-shadow: 0 0 10px #9ecaed; box-shadow: 0 0 10px #9ecaed;
} }
.editable:hover { .editable:hover {
border-width: 0px;
border-style: solid;
border-radius: 5px;
outline: none;
border-color: #9ecaed; border-color: #9ecaed;
box-shadow: 0 0 10px #9ecaed; box-shadow: 0 0 10px #9ecaed;
} }
textarea.editable{ textarea.editable{
display: block; max-width: 100%;
min-width: 600px;
border:none;
background: none;
padding: 6px;
margin-bottom: 8px;
} }
/* Panel Colecciones */ /* Panel Colecciones */
......
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