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
fafe7d68
authored
Feb 03, 2016
by
Arturo Montejo Ráez
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
some changes in sessions style
parent
e35c7abc
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
32 additions
and
19 deletions
sails/src/assets/app/css/main.css
sails/src/assets/app/modules/student/views/session.html
sails/src/assets/app/css/main.css
View file @
fafe7d68
...
...
@@ -913,4 +913,19 @@ input[type=range]:focus::-ms-fill-upper {
}
}
\ No newline at end of file
.numberCircle
{
border-radius
:
50%
;
behavior
:
url(PIE.htc)
;
/* remove if you don't care about IE8 */
width
:
36px
;
height
:
36px
;
padding
:
8px
;
background
:
#fff
;
border
:
2px
solid
#3071a9
;
color
:
#3071a9
;
text-align
:
center
;
font
:
32px
Arial
,
sans-serif
;
}
\ No newline at end of file
sails/src/assets/app/modules/student/views/session.html
View file @
fafe7d68
...
...
@@ -178,9 +178,9 @@
<div
class=
"list-group-item"
ng-repeat=
"s in wsessions | orderBy: '-begin' | limitTo: numPerPage:(currentPage-1)*numPerPage"
>
<!-- <span class="badge">{{ s.tries.length }}</span> -->
<div
ng-show=
"showLastTry && wsessions.length > 0"
>
<h
3
>
{{ 'last_session' | translate}}: {{ studentData.current_method }}, {{ studentData.current_instruction }} ({{s.begin | date:'dd-MM-yyyy'}} )
</h
3
>
<h
4
>
<strong>
{{ 'last_session' | translate}}
</strong>
: {{ studentData.current_method }}, {{ studentData.current_instruction }}
</h
4
>
<div
ng-show=
"ws_recover"
>
<table
style=
"border: 1px solid #666666; padding:5px; background-color:#f5f5f5;"
width=
"100%"
>
<td><h4>
...
...
@@ -201,15 +201,11 @@
Ensayos
<span
class=
"badge"
>
{{ s.tries.length }}
</span>
</button>
<table>
<td><h4
ng-show=
"!showLastTry"
class=
"list-group-item-heading color_green"
>
#{{$index+1}}
</h4></td>
<td><h4
style=
"text-align: right;"
class=
"list-group-item-heading color_green"
>
{{ s.begin | date:'dd-MM-yyyy' }}
</h4>
<p
style=
"text-align: right;"
class=
"list-group-item-text color_green"
>
{{ s.begin | date:'HH:mm' }} - {{ s.end | date:'HH:mm' }}
</p>
</td>
<td
rowspan=
"2"
>
<textarea
type=
"editable title"
rows=
"2"
id=
"ins_desc_ws"
placeholder=
" Notas de sesión"
ng-model=
"s.description"
<span
ng-show=
"!showLastTry"
class=
"list-group-item-heading color_green numberCircle"
>
{{$index+1}}
</span>
<p
style=
"text-align: left"
class=
"list-group-item-text color_green"
><b>
{{ s.begin | date:'dd-MM-yyyy' }}
</b>
de
{{ s.begin | date:'HH:mm' }} a {{ s.end | date:'HH:mm' }}
</p>
<textarea
type=
"editable title"
rows=
"2"
id=
"ins_desc_ws"
placeholder=
" Notas de sesión"
ng-model=
"s.description"
ng-model-options=
"{ updateOn: 'blur' }"
ng-change=
"update_ws(s)"
cols=
"80"
></textarea>
</td>
</table>
<!-- Collapse tries -->
<a
class=
"session_details"
ng-click=
"showTries = !showTries"
>
<span
ng-if=
"!showTries"
class=
"glyphicon glyphicon-collapse-down color_green"
aria-hidden=
"true"
></span>
...
...
@@ -221,8 +217,8 @@
<div
ng-show=
"!is_currentOpenTry(t)"
>
<!--the current try is not showed-->
<!-- Pictos submitted by the student -->
<table
width=
"100%"
>
<tr><td>
<div
class=
"try_time color_blue pull-left"
>
#{{$index+1}}
</div>
<tr><td>
<div
class=
"pull-left"
ng-repeat=
"p in t.actions"
>
<div
class=
"picto"
popover=
"{{ 'action-' + p.type | translate }}"
popover-trigger=
"mouseenter"
>
<img
ng-src=
"{{ p.description.picto.uri }}"
>
...
...
@@ -263,10 +259,12 @@
</div>
</td></tr>
<tr><td>
<div
class=
"try_time pull-left"
>
<div
class=
"color_blue"
><strong>
{{t.begin | date:'dd-MM-yyyy' }}
</strong>
{{t.begin | date:'HH:mm:ss' }} - {{t.end | date:'HH:mm:ss' }}
</div>
</div>
<!-- Collapse try notes -->
<div
class=
"try_time pull-left"
>
<div
class=
"color_blue"
><strong>
({{$index+1}}) {{t.begin | date:'dd-MM-yyyy' }}
</strong>
de {{t.begin | date:'HH:mm:ss' }} a {{t.end | date:'HH:mm:ss' }}
</div>
</div>
<!-- Collapse try notes -->
<a
class=
"try_details"
ng-click=
"showTryNotes = !showTryNotes"
>
<span
ng-if=
"!showActions"
class=
"glyphicon glyphicon-collapse-down"
aria-hidden=
"true"
></span>
<span
ng-if=
"showActions"
class=
"glyphicon glyphicon-collapse-up"
aria-hidden=
"true"
></span>
...
...
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