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
feff5acb
authored
May 08, 2017
by
Sebastián Collado Montañez
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
working on method interface
parent
1f2ce4a2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
35 additions
and
23 deletions
sails/src/assets/scripts/modules/student/views/instructions.html
sails/src/assets/styles/main.css
sails/src/assets/scripts/modules/student/views/instructions.html
View file @
feff5acb
...
...
@@ -36,13 +36,16 @@
<input
type=
"text"
class=
"editable title"
ng-model=
"m.name "
ng-blur=
"update_method(m)"
/>
</div>
<div
class=
"col-sm-6 text-right"
>
<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=
"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 color_red glyphicon glyphicon-remove-circle options-button"
aria-hidden=
"true"
></span></a>
</div>
</div>
</div>
<textarea
class=
"editable"
ng-model=
"m.description "
placeholder=
"{{'description' | translate}}"
ng-blur=
"update_method(m)"
></textarea>
<div
class=
"container-fluid"
>
<textarea
class=
"editable"
ng-model=
"m.description "
placeholder=
"{{'description' | translate}}"
ng-blur=
"update_method(m)"
></textarea>
</div>
<!-- Tabla método -->
<table
class=
"table_instructions table"
>
...
...
@@ -60,15 +63,15 @@
<a
ng-click=
"open_instruction(i)"
><span
class=
"glyphicon glyphicon-file text_medium"
aria-hidden=
"true"
></span></a>
</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
class=
"editable"
>
<td><
textarea
class=
"elipsis editable"
type=
"text"
ng-model=
"i.objective"
ng-blur=
"update_instruction(i)"
></textarea
></td>
<td>
<div
class=
"text-center"
>
<span
class=
"color_blue"
>
{{ i.begin | date:"dd-MM-yyyy" }}
</span>
<br>
{{ i.begin | date:"HH:mm:ss" }}
</div>
</td>
<td
class=
"editable"
>
<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>
...
...
@@ -93,11 +96,14 @@
</table>
<!-- Añadir instrucción al método -->
<p
class=
"text-right"
>
<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
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>
<!-- Fin de .method -->
...
...
sails/src/assets/styles/main.css
View file @
feff5acb
...
...
@@ -257,19 +257,21 @@ tr:hover .ops a{
/* Panel Instrucciones */
.method-header
{
background-color
:
#F5F5F3
;
padding
:
5px
;
margin-bottom
:
5px
;
border
:
1px
solid
#DDDDDD
;
border-top-left-radius
:
10
px
;
border-top-right-radius
:
10
px
;
min-height
:
45px
;
}
.method-header
{
background-color
:
#F5F5F3
;
padding
:
5px
;
min-height
:
4
5px
;
margin-bottom
:
5px
;
border-top-left-radius
:
5
px
;
border-top-right-radius
:
5
px
;
border-bottom
:
1px
solid
#DDDDDD
;
}
.method
{
margin-bottom
:
30px
;
}
.method
{
margin-bottom
:
30px
;
border-radius
:
5px
;
border
:
1px
solid
#DDDDDD
;
}
#method_select
{
max-width
:
300px
;
...
...
@@ -277,6 +279,10 @@ tr:hover .ops a{
padding-top
:
2px
;
}
.options
{
padding-top
:
7px
;
}
.options-button
{
opacity
:
.2
;
}
...
...
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