Gitlab CSE Unil

Commit 3bbe9628 authored by M. Chardon's avatar M. Chardon
Browse files

migration de la police whhg-font (erreur dans la police) sur fa et material-icon

parent 85236afb
module.exports = function(grunt) {
module.exports = function (grunt) {
var jsOptimizedSuffix = '.min';
grunt.initConfig({
......@@ -9,9 +8,9 @@ module.exports = function(grunt) {
adim: {
options: {
banner: '/*! <%= pkg.name %> - v<%= pkg.version %> - ' +
'<%= grunt.template.today("yyyy-mm-dd") %> - ' +
'Copyright (C) <%= grunt.template.today("yyyy") %> Université de Lausanne - ' +
'see licence */' + grunt.util.linefeed,
'<%= grunt.template.today("yyyy-mm-dd") %> - ' +
'Copyright (C) <%= grunt.template.today("yyyy") %> Université de Lausanne - ' +
'see licence */' + grunt.util.linefeed,
compress: {
drop_console: false
}
......@@ -30,7 +29,7 @@ module.exports = function(grunt) {
files: [{
src: "lib/requirejs/require.js",
dest: "../js/libs/require.min.js"
},{
}, {
src: "lib/jquery.hotkeys/jquery.hotkeys.js",
dest: "lib/jquery.hotkeys/jquery.hotkeys.min.js"
}]
......@@ -51,8 +50,8 @@ module.exports = function(grunt) {
paths: {
zip: "empty:",
adim:"_build/adim",
tools:"_build/adim/tools",
adim: "_build/adim",
tools: "_build/adim/tools",
helper: '_build/adim/helper'
}
},
......@@ -146,7 +145,7 @@ module.exports = function(grunt) {
},
{
expand: true,
cwd: "lib/whhg-font/font",
cwd: "lib/material-design-icons/iconfont",
src: ["**"],
dest: '../fonts/'
},
......@@ -180,6 +179,12 @@ module.exports = function(grunt) {
src: ["OpenSans-*"],
dest: '../fonts/open-sans/'
}
/*{
expand: true,
cwd: "lib/whhg-font/font",
src: ["**"],
dest: '../fonts/'
},*/
]
}
},
......@@ -187,12 +192,12 @@ module.exports = function(grunt) {
// ===== Lessc Files =====
sass: { // Task
adim: { // Target
options: { // Target options
style: 'compressed'
},
files: { // Dictionary of files
'../css/adim.css': 'scss/adim.scss', // 'destination': 'source'
}
options: { // Target options
style: 'compressed'
},
files: { // Dictionary of files
'../css/adim.css': 'scss/adim.scss', // 'destination': 'source'
}
}
},
......@@ -217,7 +222,8 @@ module.exports = function(grunt) {
"../css/libs.css": [
"lib/jquery-file-upload/css/jquery.fileupload.css",
"lib/bootstrap-colorpicker/dist/css/bootstrap-colorpicker.css",
"lib/whhg-font/css/whhg.css"
"lib/material-design-icons/iconfont/material-icons.css"
//"lib/whhg-font/css/whhg.css"
]
}
}
......
......@@ -156,12 +156,18 @@ define([
ui.updateReservedSpace();
ui.adjustCanvasToImage();
canvasCtnr.css("transition", "");
var icon = $("a[href='#" + $(this).attr('id') + "'] .fa-chevron-circle-right");
icon.removeClass("fa-chevron-circle-right");
icon.addClass("fa-chevron-circle-left");
})
.on('show.bs.collapse', function () {
displayAltCol(true);
sharedAnnotationMarkersPanel.appendTo(altSideColPanelGroup);
ui.updateReservedSpace();
ui.adjustCanvasToImage();
var icon = $("a[href='#" + $(this).attr('id') + "'] .fa-chevron-circle-left");
icon.removeClass("fa-chevron-circle-left");
icon.addClass("fa-chevron-circle-right");
})
;
}
......
......@@ -445,8 +445,8 @@ define([
$el.attr("type", readable ? 'password' : 'text');
$but.siblings("span")
.toggleClass('icon-eye-open', readable)
.toggleClass('icon-eye-close', !readable);
.toggleClass('fa-eye', readable)
.toggleClass('fa-eye-slash', !readable);
};
})(),
......
......@@ -25,6 +25,7 @@
"jquery-mousewheel": "~3.1.11",
"jquery.autoGrowInput": "~0.0.2",
"jquery.hotkeys": "git://github.com/jeresig/jquery.hotkeys.git#~0.2.0",
"material-design-icons": "~3.0.1",
"paper": "~0.11.5",
"popper.js": "~1.14.3",
"requirejs": "",
......
......@@ -817,7 +817,8 @@ body.home #dlg-about-adim .modal-dialog {
.panel-group .panel-heading a[data-toggle="collapse"]:hover {
text-decoration: none;
}
.panel-group .panel-heading a[data-toggle="collapse"]:hover .icon-circleup {
.panel-group .panel-heading a[data-toggle="collapse"]:hover .icon-circleup,
.panel-group .panel-heading a[data-toggle="collapse"]:hover .fa-chevron-circle-up {
color: #2b2b2b;
}
#side-col-panel-group a[data-toggle="collapse"].collapsed .icon-circleup:before,
......
......@@ -722,7 +722,7 @@ $cimaf-sidecol-width: 250px;
text-decoration: none;
&:hover {
text-decoration: none;
.icon-circleup {
.icon-circleup,.fa-chevron-circle-up {
color: darken($panel-dark-color, 10%);
}
}
......
This diff is collapsed.
......@@ -28,7 +28,7 @@
{{ block.super }}
<li class="nav-item info">
<a href="#" id="adim-about-but" class="nav-link"><span class="icon-info-sign"></span>&nbsp;</a>
<a href="#" id="adim-about-but" class="nav-link"><i class="fas fa-info-circle"></i>&nbsp;</a>
</li>
{% endblock navbar_right_content %}
......@@ -176,13 +176,9 @@
<script type="text/template" id="aom-list-item">
<div class="btn-toolbar justify-content-between" role="toolbar" aria-label="Toolbar with button groups">
<div class="btn-group" role="group" aria-label="First group">
{# <% if (sharing_mode > 0 && sharing_mode < 16) { %><span class="glyphicon glyphicon-globe text-success aom-item-sh-status" title="Partagé"></span><% } %>#}
{# <% if (sharing_mode > 0 && sharing_mode < 16) { %><span class="icon-share-alt text-success aom-item-sh-status" title="Partagé"></span><% } %>#}
{# <% if (sharing_mode > 15) { %><span class="adim-icon-ttp-moodle text-success aom-item-sh-status" title="Partagé via moodle"></span><% } %>#}
<% switch(true) { case 0 < sharing_mode && sharing_mode < 16: %><span class="fas fa-share-alt text-success aom-item-sh-status" title="Partagé"></span><% break %>
<% case sharing_mode == 16: %><span class="adim-icon-ttp-moodle text-success aom-item-sh-status" title="Partagé via moodle"></span><% break %>
<% case sharing_mode == 32: %><span class="icon-bowl text-success aom-item-sh-status" title="Partagé via yin-zhen"></span><% break %>
<% case sharing_mode == 32: %><span class="fa fa-coffee text-success aom-item-sh-status" title="Partagé via yin-zhen"></span><% break %>
<% case sharing_mode > 0: %><span class="fa fa-cloud text-success aom-item-sh-status" title="Partagé via service externe"></span>
<% } %>
......@@ -281,7 +277,7 @@ if (t === "light") {
</label>
<label class="btn btn-lg btn-primary" title="Lignes (L)">
<input type="radio" name="toolType" value="lines" id="tool-lines" data-tool-name="lines" autocomplete="off">
<span class="icon-line"></span><span class="tool-text"> Lignes</span>
<span class="fas fa-minus"></span><span class="tool-text"> Lignes</span>
</label>
<label class="btn btn-lg btn-primary" title="Cercle (C)">
<input type="radio" name="toolType" value="ellipse" id="tool-ellipse" data-tool-name="ellipse" autocomplete="off">
......@@ -351,12 +347,12 @@ if (t === "light") {
<button class="btn btn-light" id="attr-orderup" type="button" autocomplete="off"
title="Mettre au premier plan. shift-click: avancer de un niveau">
<span class="icon-layerorderup"></span>
<i class="material-icons">flip_to_front</i>
</button>
<button class="btn btn-light" id="attr-orderdown" type="button" autocomplete="off"
title="Mettre à l'arrière-plan. shift-click: reculer d'un niveau">
<span class="icon-layerorderdown"></span>
<i class="material-icons">flip_to_back</i>
</button>
{% endblock param-tool-tb %}
</div>
......@@ -381,7 +377,7 @@ if (t === "light") {
<small>1:1</small>
</span>
<span class="input-group-addon btn" title="Zoom pour afficher toute l'image" id="but-zoom-fit">
<span class="icon-resize"></span>
<span class="material-icons">photo_size_select_large</span>
</span>
</div>
<div class="sldr float-left">
......@@ -418,7 +414,7 @@ if (t === "light") {
<div class="p-1 ml-auto default" id="side-col">
<div class="side-col-collapse-but">
<button class="btn btn-sm btn-block btn-defaultX" type="button" data-toggle="collapse" data-target="#side-col-collapse-content" aria-expanded="false">
<span class="icon-circleright float-left"></span>
<i class="fas fa-chevron-circle-right float-left"></i>
</button>
</div>
<div class="row collapse width show" id="side-col-collapse-content">
......@@ -478,7 +474,7 @@ if (t === "light") {
</span>
</span>
</div>
<i class="icon-circleup ml-auto"></i>
<i class="fas fa-chevron-circle-down ml-auto"></i>
</a>
<div id="annotationSharingPanel" class="panel-dark collapse {{ collapsed|yesno:",in" }}">
<div class="card card-body">
......@@ -517,7 +513,7 @@ if (t === "light") {
<a class="btn btn-secondary btn-sm btn-block d-inline-flex" data-toggle="collapse" href="#collapseProperties" role="button"
aria-expanded="false" aria-controls="collapseProperties">
<div>Propriétés</div>
<i class="icon-circleup ml-auto"></i>
<i class="fas fa-chevron-circle-up ml-auto"></i>
</a>
<div class="collapse show panel-dark" id="collapseProperties">
......@@ -542,7 +538,7 @@ if (t === "light") {
<a data-toggle="collapse" href="#collapseUsers" class="{{ collapsed|yesno:"collapsed," }} btn btn-secondary btn-sm btn-block d-inline-flex"
role="button" aria-expanded="false" aria-controls="collapseUsers">
<div>Utilisateurs</div>
<i class="icon-circleup ml-auto"></i>
<i class="fas fa-chevron-circle-up ml-auto"></i>
</a>
<div id="collapseUsers" class="collapse show panel-dark">
<div class="card card-body">
......@@ -557,7 +553,7 @@ if (t === "light") {
</div>
<div class="btn-group">
<button id="btn-layers-hidenames" class="btn btn-sm btn-adim-layertb {{ hidenames|yesno:"active," }}" type="button" title="Masquer/afficher les noms">
<span class="icon-shades-sunglasses"></span>
<span class="glyphicon glyphicon-sunglasses"></span>
</button>
</div>
<div class="btn-group">
......
......@@ -31,7 +31,7 @@
</label>
<label class="btn btn-lg btn-primary" title="Lignes (L)">
<input type="radio" name="toolType" value="lines" id="tool-lines" data-tool-name="lines">
<span class="icon-line"></span><span class="tool-text"> Lignes</span>
<span class="fas fa-minus"></span><span class="tool-text"> Lignes</span>
</label>
<label class="btn btn-lg btn-primary" title="Cercle (C)">
<input type="radio" name="toolType" value="ellipse" id="tool-ellipse" data-tool-name="ellipse">
......@@ -76,7 +76,7 @@
</button>
<button class="btn btn-light" id="attr-font" type="button">
<span class="icon-fontcase"></span>
<span class="fa fa-text-height"></span>
</button>
<div class="sldr btn btn-light" id="attr-size-slider">
......@@ -94,12 +94,12 @@
<button class="btn btn-light" id="attr-orderup" type="button" autocomplete="off"
title="Mettre au premier plan. shift-click: avancer de un niveau">
<span class="icon-layerorderup"></span>
<i class="material-icons">flip_to_front</i>
</button>
<button class="btn btn-light" id="attr-orderdown" type="button" autocomplete="off"
title="Mettre à l'arrière-plan. shift-click: reculer d'un niveau">
<span class="icon-layerorderdown"></span>
<i class="material-icons">flip_to_back</i>
</button>
{% endblock param-tool-tb %}
......@@ -115,7 +115,7 @@
<a class="btn btn-secondary btn-sm btn-block d-inline-flex" data-toggle="collapse" href="#collapseDisplay" role="button"
aria-expanded="false" aria-controls="collapseDisplay">
<div>Afficher</div> <i class="icon-circleup ml-auto"></i>
<div>Afficher</div> <i class="fas fa-chevron-circle-up ml-auto"></i>
</a>
<div class="collapse show panel-dark" id="collapseDisplay">
......@@ -181,7 +181,7 @@
<div id="annotation-markers-panel">
<a class="btn btn-secondary btn-sm btn-block d-inline-flex" data-toggle="collapse" href="#collapseMarkers" role="button"
aria-expanded="false" aria-controls="collapseMarkers">
<div>Labels</div> <i class="icon-circleup ml-auto"></i>
<div>Labels</div> <i class="fas fa-chevron-circle-up ml-auto"></i>
</a>
<div class="collapse show panel-dark" id="collapseMarkers">
......@@ -305,7 +305,7 @@
<div id="shared-annotation-markers-panel" style="display: none;">
<a class="btn btn-secondary btn-sm btn-block d-inline-flex" data-toggle="collapse" href="#collapseSharedMarkers" role="button"
aria-expanded="false" aria-controls="collapseSharedMarkers">
<div>Labels</div> <i class="icon-circleright ml-auto"></i>
<div>Labels</div> <i class="fas fa-chevron-circle-right ml-auto"></i>
</a>
<div class="collapse show panel-dark show" id="collapseSharedMarkers">
......
......@@ -115,12 +115,12 @@
<button class="btn btn-light" id="attr-orderup" type="button" autocomplete="off"
title="Mettre au premier plan. shift-click: avancer de un niveau">
<span class="icon-layerorderup"></span>
<i class="material-icons">flip_to_front</i>
</button>
<button class="btn btn-light" id="attr-orderdown" type="button" autocomplete="off"
title="Mettre à l'arrière-plan. shift-click: reculer d'un niveau">
<span class="icon-layerorderdown"></span>
<i class="material-icons">flip_to_back</i>
</button>
{% endblock param-tool-tb %}
......@@ -133,7 +133,7 @@
<a class="btn btn-secondary btn-sm btn-block d-inline-flex" data-toggle="collapse" href="#collapseDisplay" role="button"
aria-expanded="false" aria-controls="collapseDisplay">
<div>Afficher</div> <i class="icon-circleup ml-auto"></i>
<div>Afficher</div> <i class="fas fa-chevron-circle-up ml-auto"></i>
</a>
<div id="annotation-display-panel">
......
......@@ -31,7 +31,7 @@
</label>
<label class="btn btn-lg btn-primary" title="Lignes (L)">
<input type="radio" name="toolType" value="lines" id="tool-lines" data-tool-name="linesgeo">
<span class="icon-line"></span><span class="tool-text"> Lignes</span>
<span class="fas fa-minus"></span><span class="tool-text"> Lignes</span>
</label>
<label class="btn btn-lg btn-primary" title="Cercle (C)">
<input type="radio" name="toolType" value="ellipse" id="tool-ellipse" data-tool-name="ellipsegeo">
......@@ -71,12 +71,12 @@
<button class="btn btn-light" id="attr-orderup" type="button" autocomplete="off"
title="Mettre au premier plan. shift-click: avancer de un niveau">
<span class="icon-layerorderup"></span>
<i class="material-icons">flip_to_front</i>
</button>
<button class="btn btn-light" id="attr-orderdown" type="button" autocomplete="off"
title="Mettre à l'arrière-plan. shift-click: reculer d'un niveau">
<span class="icon-layerorderdown"></span>
<i class="material-icons">flip_to_back</i>
</button>
{% endblock param-tool-tb %}
......@@ -92,7 +92,7 @@
<a class="btn btn-secondary btn-sm btn-block d-inline-flex" data-toggle="collapse" href="#collapseDisplay" role="button"
aria-expanded="false" aria-controls="collapseDisplay">
<div>Afficher</div> <i class="icon-circleup ml-auto"></i>
<div>Afficher</div> <i class="fas fa-chevron-circle-up ml-auto"></i>
</a>
<div class="collapse show panel-dark" id="collapseDisplay">
......
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 to comment