Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
yotta
/
pictogram
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
60
Merge Requests
0
Pipelines
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
4146cf9d
authored
May 04, 2017
by
Fernando Martínez Santiago
Browse files
Options
_('Browse Files')
Download
Plain Diff
Merge branch 'develop' of
http://gitlab.ujaen.es/yotta/pictogram
into develop
parents
f35fbc40
4405ba6f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
30 additions
and
22 deletions
sails/src/assets/scripts/modules/student/views/instructions.html
sails/src/assets/scripts/modules/supervisor/views/instructions.html
sails/src/assets/styles/main.css
sails/src/assets/scripts/modules/student/views/instructions.html
View file @
4146cf9d
...
@@ -29,11 +29,13 @@
...
@@ -29,11 +29,13 @@
<!-- END select to add new method -->
<!-- END select to add new method -->
<!-- Method instructions -->
<!-- Method instructions -->
<div
class=
"method
_details
"
ng-repeat=
"m in methods"
>
<div
class=
"method"
ng-repeat=
"m in methods"
>
<div
class=
"method-header"
>
<div
class=
"method-header"
>
<input
type=
"text"
class=
"editable title"
ng-model=
"m.name "
ng-blur=
"update_method(m)"
/>
<div
class=
"col-sm-6"
>
<div
class=
"method-header-options"
>
<input
type=
"text"
class=
"editable title"
ng-model=
"m.name "
ng-blur=
"update_method(m)"
/>
</div>
<div
class=
"col-sm-6 text-right"
>
<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"
><span
class=
"text_medium color_black glyphicon glyphicon-floppy-disk options-button"
aria-hidden=
"true"
></span></a>
<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>
<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>
...
@@ -57,19 +59,19 @@
...
@@ -57,19 +59,19 @@
<td>
<td>
<a
ng-click=
"open_instruction(i)"
><span
class=
"glyphicon glyphicon-file text_medium"
aria-hidden=
"true"
></span></a>
<a
ng-click=
"open_instruction(i)"
><span
class=
"glyphicon glyphicon-file text_medium"
aria-hidden=
"true"
></span></a>
</td>
</td>
<td><input
class=
"editable"
type=
"text"
ng-model=
"i.name"
ng-blur=
"update_instruction(i)"
/></td>
<td><input
class=
"editable"
type=
"text"
ng-model=
"i.name"
ng-blur=
"update_instruction(i)"
/></td>
<td><input
class=
"elipsis editable"
type=
"text"
ng-model=
"i.objective"
ng-blur=
"update_instruction(i)"
/></td>
<td><input
class=
"elipsis editable"
type=
"text"
ng-model=
"i.objective"
ng-blur=
"update_instruction(i)"
/></td>
<td
class=
"editable"
>
<td
class=
"editable"
>
<div
class=
"text-center"
>
<div
class=
"text-center"
>
<span
class=
"color_blue"
>
{{ i.begin | date:"dd-MM-yyyy" }}
</span>
<span
class=
"color_blue"
>
{{ i.begin | date:"dd-MM-yyyy" }}
</span>
<br
/
>
<br>
{{ i.begin | date:"HH:mm:ss" }}
{{ i.begin | date:"HH:mm:ss" }}
</div>
</div>
</td>
</td>
<td
class=
"editable"
>
<td
class=
"editable"
>
<div
class=
"text-center"
ng-class=
"{ color_green : i.id == m.last_ins }"
>
<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>
<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
/
>
<br>
{{ i.end | date:"HH:mm:ss" }}
{{ i.end | date:"HH:mm:ss" }}
</div>
</div>
</td>
</td>
...
@@ -82,7 +84,11 @@
...
@@ -82,7 +84,11 @@
'glyphicon-minus': i.status == null
'glyphicon-minus': i.status == null
}"
aria-hidden=
"true"
popover=
"{{(i.status || 'nobegin') | translate}}"
popover-trigger=
"mouseenter"
ng-click=
"change_status(i)"
></span>
}"
aria-hidden=
"true"
popover=
"{{(i.status || 'nobegin') | translate}}"
popover-trigger=
"mouseenter"
ng-click=
"change_status(i)"
></span>
</td>
</td>
<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>
<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>
</tr>
</tr>
</table>
</table>
...
@@ -93,7 +99,7 @@
...
@@ -93,7 +99,7 @@
</a>
</a>
</p>
</p>
</div>
</div>
<!-- Fin de .method
_details
-->
<!-- Fin de .method -->
</div>
</div>
...
...
sails/src/assets/scripts/modules/supervisor/views/instructions.html
View file @
4146cf9d
...
@@ -16,15 +16,18 @@
...
@@ -16,15 +16,18 @@
<!-- END select to add new method -->
<!-- END select to add new method -->
<!-- Method instructions -->
<!-- Method instructions -->
<div
class=
"method_details
"
ng-repeat=
"m in methods"
>
<div
class=
"method
"
ng-repeat=
"m in methods"
>
<input
type=
"text"
class=
"editable title"
ng-model=
"m.name "
ng-blur=
"update_method(m)"
/>
<div
class=
"method-header"
>
<div
class=
"col-sm-6"
>
<input
type=
"text"
class=
"editable title"
ng-model=
"m.name "
ng-blur=
"update_method(m)"
/>
</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
class=
"options"
>
<textarea
class=
"editable"
ng-model=
"m.description "
placeholder=
"{{'description' | translate}}"
ng-blur=
"update_method(m)"
></textarea>
<a
ng-click=
"delete_method(m)"
popover=
"{{ 'delete' | translate}}"
popover-trigger=
"mouseenter"
><span
class=
"text_medium delete color_red glyphicon glyphicon-remove-circle"
aria-hidden=
"true"
></span></a>
</div>
<textarea
class=
"editable"
ng-model=
"m.description "
placeholder=
"{{'description' | translate}}"
ng-blur=
"update_method(m)"
></textarea>
<!-- Tabla método -->
<!-- Tabla método -->
<table
class=
"table_instructions table"
>
<table
class=
"table_instructions table"
>
...
@@ -36,7 +39,7 @@
...
@@ -36,7 +39,7 @@
<tr
ng-repeat=
"i in m.metainstructions"
>
<tr
ng-repeat=
"i in m.metainstructions"
>
<td><input
class=
"editable"
type=
"text"
ng-model=
"i.name"
ng-blur=
"update_instruction(i)"
/></td>
<td><input
class=
"editable"
type=
"text"
ng-model=
"i.name"
ng-blur=
"update_instruction(i)"
/></td>
<td><input
class=
"elipsis editable"
type=
"text"
ng-model=
"i.objective"
ng-blur=
"update_instruction(i)"
/></td>
<td><input
class=
"elipsis editable"
type=
"text"
ng-model=
"i.objective"
ng-blur=
"update_instruction(i)"
/></td>
<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"
aria-hidden=
"true"
></span></a></td>
<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>
</tr>
</tr>
</table>
</table>
...
@@ -47,7 +50,7 @@
...
@@ -47,7 +50,7 @@
</a>
</a>
</p>
</p>
</div>
</div>
<!-- Fin de .method
_details
-->
<!-- Fin de .method -->
</div>
</div>
...
...
sails/src/assets/styles/main.css
View file @
4146cf9d
...
@@ -264,9 +264,10 @@ tr:hover .ops a{
...
@@ -264,9 +264,10 @@ tr:hover .ops a{
border
:
1px
solid
#DDDDDD
;
border
:
1px
solid
#DDDDDD
;
border-top-left-radius
:
10px
;
border-top-left-radius
:
10px
;
border-top-right-radius
:
10px
;
border-top-right-radius
:
10px
;
min-height
:
45px
;
}
}
.method
_details
{
.method
{
margin-bottom
:
30px
;
margin-bottom
:
30px
;
}
}
...
@@ -276,9 +277,6 @@ tr:hover .ops a{
...
@@ -276,9 +277,6 @@ tr:hover .ops a{
padding-top
:
2px
;
padding-top
:
2px
;
}
}
.method-header-options
{
float
:
right
;
}
.options-button
{
.options-button
{
opacity
:
.2
;
opacity
:
.2
;
}
}
...
@@ -321,7 +319,8 @@ td.editable input{
...
@@ -321,7 +319,8 @@ td.editable input{
}
}
input
.editable
{
input
.editable
{
min-width
:
400px
;
/*min-width: 400px;*/
width
:
100%
;
border
:
none
;
border
:
none
;
background
:
none
;
background
:
none
;
padding
:
6px
;
padding
:
6px
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment