Skip to content

yotta / pictogram

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

license interface revision and fontawesome unification

parent 9f394f14
Inline Side-by-side
Showing with 41 additions and 20 deletions
sails/src/assets/scripts/modules/student/views/setup.html
......@@ -51,28 +51,45 @@
<label translate>license_number</label>
<input type="text" id="setup_license" class="form-control" mask="wwww-wwww-wwww-wwww" clean="true" placeholder="{{ 'license_number' | translate }}" ng-model="formUser.license_number" required>
<!-- With license -->
<div ng-show="studentData.license && !studentData.license_expired" class="alert alert-info" role="alert">
<i class="fa fa-info-circle" aria-hidden="true"></i> {{ 'license_expires' | translate }} {{ studentData.expiration_date }}
<div class="row">
<div class="col-xs-2"><i class="fa fa-info-circle fa-lg" aria-hidden="true"></i></div>
<div class="col-xs-10">
<h4 class="alert-heading"> {{ 'license_expires' | translate }} <b>{{ studentData.expiration_date }}</b> </h4>
</div>
</div>
</div>
<!-- License expired -->
<div ng-show="studentData.license && studentData.license_expired" class="alert alert-warning" role="alert">
<i class="fa fa-exclamation-circle" aria-hidden="true"></i> {{ 'license_expired' | translate }} <a href="http://pictogramweb.com/caracteristicas-de-pictogram/">{{ 'license_expired_renew' | translate }}</a>
<div class="row">
<div class="col-xs-2"><i class="fa fa-exclamation-circle fa-lg" aria-hidden="true"></i></div>
<div class="col-xs-10">
<h4 class="alert-heading"> {{ 'license_expired' | translate }} </h4>
<p>
<a href="http://pictogramweb.com/caracteristicas-de-pictogram/">{{ 'license_expired_renew' | translate }}</a>
</p>
</div>
</div>
</div>
<!-- No license -->
<div ng-show="!studentData.license" class="alert alert-danger" role="alert">
<i class="fa fa-exclamation-circle" aria-hidden="true"></i> {{ 'license_missing' | translate }}. <a href="http://pictogramweb.com/caracteristicas-de-pictogram/">{{ 'more_info' | translate }}</a>
<div class="row">
<div class="col-xs-2"><i class="fa fa-exclamation-circle fa-lg" aria-hidden="true"></i></div>
<div class="col-xs-10">
<h4 class="alert-heading"> {{ 'license_missing' | translate }} </h4>
<p>
<a href="http://pictogramweb.com/caracteristicas-de-pictogram/">{{ 'more_info' | translate }}</a>
</p>
</div>
</div>
</div>
<!-- VERSION SOLO TEXTO
<span ng-show="studentData.license && !studentData.license_expired" class="text-info">
({{ 'license_expires' | translate }} {{ studentData.expiration_date }})
</span>
<span ng-show="studentData.license && studentData.license_expired" class="text-danger">
({{ 'license_expired' | translate }} {{ studentData.expiration_date }})
</span>
<span ng-show="!studentData.license" class="text-danger">
({{ 'license_missing' | translate }})
</span>
-->
</div>
</fieldset>
</div>
</div>
......
sails/src/assets/scripts/modules/supervisor/views/students.html
......@@ -39,8 +39,8 @@
</div>
</td>
<td>
<span ng-show="!student.licenseIsValid" class="license-warning text-danger glyphicon glyphicon-exclamation-sign" aria-hidden="true" popover="{{ 'license_missing' | translate}}" popover-trigger="mouseenter"></span>
<i ng-show="student.licenseIsValid" class="fa fa-certificate license-warning text-primary" aria-hidden="true" popover="{{ 'license_pro' | translate}}" popover-trigger="mouseenter"></i>
<i ng-show="!student.licenseIsValid" class="fa fa-exclamation-circle fa-lg text-danger license-warning" aria-hidden="true" popover="{{ 'license_missing' | translate}}" popover-trigger="mouseenter"></i>
<i ng-show="student.licenseIsValid" class="fa fa-certificate fa-lg text-primary license-warning" aria-hidden="true" popover="{{ 'license_pro' | translate}}" popover-trigger="mouseenter"></i>
</td>
<td>
<h4>{{student.surname}}, {{student.name}}</h4>
......@@ -72,7 +72,7 @@
</td> <!-- /BUTTONS -->
<td>
<a ng-if="user.isSupAdmin" ng-click="delete_student(student)" class="delete_stu" title="{{ 'delete' | translate}}">
<span class="color_red glyphicon glyphicon-remove-circle" aria-hidden="true"></span>
<span class="glyphicon glyphicon-remove-circle text-danger" aria-hidden="true"></span>
</a>
</td>
</tr>
......
sails/src/assets/styles/main.css
......@@ -834,7 +834,7 @@ img.profile{
}
.delete_tutor, .delete_sup, .delete_device, .delete_stu{
visibility: hidden;
opacity: .2;
float: right;
}
......@@ -843,16 +843,20 @@ img.profile{
margin-top: 4px;
}
.delete_stu, .license-warning{
.delete_stu{
font-size: 18px;
margin-top: 10px;
}
.license-warning{
margin-top: 10px;
}
#user_tutors .list-group-item:hover .delete_tutor,
#user_sups .list-group-item:hover .delete_sup,
#table_students tr:hover .delete_stu{
visibility: visible;
opacity: 1;
}
label.student_setup{
......
  • Sebastián Collado Montañez @scollado commented
    Developer

    Cambios realizados

    • Estudiante con licencia PRO:

    license_a antes

    license_b ahora

    • Estudiante sin licencia PRO:

    no_license_a antes

    no_license_b ahora

    • Lista de estudiantes con fontawesome (delete aparece de forma permanente, con opacidad):

    students_a antes

    students_b ahora

    Edited by Sebastián Collado Montañez
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