Skip to content

yotta / pictogram

Go to a project
Commit f22b3dc8 by Arturo Montejo Ráez
Options

Merge branch 'develop' of http://scm.ujaen.es/softuno/pictogram into develop

parents 4e09dcbd 281185b6
Inline Side-by-side
Showing with 12 additions and 10 deletions
sails/src/assets/app/index.html
......@@ -2,7 +2,7 @@
<html lang="en" ng-app="dashboardApp">
<head>
<meta charset="utf-8">
<title>Pictogram Dashboard</title>
<title>Pictogram Web</title>
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<link rel="stylesheet" href="css/main.css">
<link rel="icon" href="img/logo_pictogram.png" type='image/png'>
......
sails/src/assets/scripts/modules/common/views/cropimg.html
......@@ -25,9 +25,7 @@
<img ng-src="{{ croppedDataUrl }}" />
</div>
<div class="form-group">
<button class="btn btn-default" ng-click="crop(croppedDataUrl, picFile.name)" ng-model="picFile" accept="image/*">
<span class="glyphicon glyphicon-upload"></span> {{ 'upload_image' | translate }}
</button>
</div>
<div class="form-group">
<span class="progress" ng-show="progress > 0">
......@@ -40,6 +38,11 @@
</div> <!-- /modal-body -->
<div class="modal-footer">
<button class="btn btn-primary" ng-click="cancel()">{{ 'close' | translate }}</button>
<button class="btn btn-danger" ng-click="cancel()">
<i class="fa fa-times-circle" aria-hidden="true"></i> Cancelar
</button>
<button class="btn btn-success" ng-click="crop(croppedDataUrl, picFile.name)" ng-model="picFile" accept="image/*">
<i class="fa fa-upload" aria-hidden="true"></i> {{ 'upload_image' | translate }}
</button>
</div>
</div>
sails/src/assets/scripts/modules/student/views/pictoexp.html
......@@ -6,11 +6,11 @@
<h4 class="modal-title" id="myModalLabel" translate>add_expression</h4>
</div>
<div class="modal-body">
<form ng-submit="save()">
<div id="add_label" class="input-group">
<span class="input-group-addon glyphicon glyphicon-comment" aria-hidden="true"></span>
<input type="text" class="form-control" ng-model="expression" />
<input type="text" class="form-control" ng-model="expression" autofocus/>
<span class="input-group-btn">
<button class="btn btn-success" type="submit" translate>save</button>
</span>
......@@ -19,4 +19,4 @@
</div>
<!-- End modal-body -->
</div>
\ No newline at end of file
</div>
sails/src/assets/scripts/modules/supervisor/views/students_add.html
......@@ -26,7 +26,7 @@
</div>
<div class="form-group">
<input type="text" id="student_license" mask="9999-9999-9999-9999" clean="true" placeholder="{{ 'license_number' | translate }}" ng-model="formdatastudent.license_number" required>
<input class="form-control" type="text" id="student_license" mask="9999-9999-9999-9999" clean="true" placeholder="{{ 'license_number' | translate }}" ng-model="formdatastudent.license_number" required>
</div>
......
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