Index: src/templates/admin/_head.tpl
==================================================================
--- src/templates/admin/_head.tpl
+++ src/templates/admin/_head.tpl
@@ -38,11 +38,11 @@
Index: src/templates/admin/compta/comptes/journal.tpl
==================================================================
--- src/templates/admin/compta/comptes/journal.tpl
+++ src/templates/admin/compta/comptes/journal.tpl
@@ -32,11 +32,11 @@
{foreach from=$journal item="ligne"}
{$ligne.id|escape} |
{if $user.droits.compta >= Garradin\Membres::DROIT_ADMIN}
- ✎
+ ✎
{/if}
|
{$ligne.date|date_fr:'d/m/Y'|escape} |
{if $ligne.compte_credit == $compte.id}{$credit}{else}{$debit}{/if}{$ligne.montant|html_money} |
{$ligne.solde|html_money} |
Index: src/templates/admin/compta/operations/index.tpl
==================================================================
--- src/templates/admin/compta/operations/index.tpl
+++ src/templates/admin/compta/operations/index.tpl
@@ -40,11 +40,11 @@
{foreach from=$journal item="ligne"}
{$ligne.id|escape} |
{if $user.droits.compta >= Garradin\Membres::DROIT_ADMIN}
- ✎
+ ✎
{/if}
|
{$ligne.date|date_fr:'d/m/Y'|escape} |
{$ligne.montant|html_money} {$config.monnaie|escape} |
{$ligne.libelle|escape} |
Index: src/templates/admin/compta/operations/membre.tpl
==================================================================
--- src/templates/admin/compta/operations/membre.tpl
+++ src/templates/admin/compta/operations/membre.tpl
@@ -57,11 +57,11 @@
{foreach from=$journal item="ligne"}
{$ligne.id|escape} |
{if $user.droits.compta >= Garradin\Membres::DROIT_ADMIN}
- ✎
+ ✎
{/if}
|
{$ligne.date|format_sqlite_date_to_french|escape} |
{$ligne.montant|html_money} |
{$ligne.libelle|escape} |
Index: src/templates/admin/config/membres.tpl
==================================================================
--- src/templates/admin/config/membres.tpl
+++ src/templates/admin/config/membres.tpl
@@ -258,16 +258,30 @@
field.parentNode.insertBefore(field, p);
}
return false;
};
actions.appendChild(down);
+
+ var edit = document.createElement('span');
+ edit.className = 'icn edit';
+ edit.innerHTML = '✎';
+ edit.title = 'Modifier ce champ';
+ edit.onclick = function (e) {
+ var content = this.parentNode.parentNode.querySelector('dl');
+ if (content.style.display.toLowerCase() == 'none')
+ content.style.display = 'block';
+ else
+ content.style.display = 'none';
+ return false;
+ };
+ actions.appendChild(edit);
if (field.id != 'f_email' && field.id != 'f_passe')
{
var rem = document.createElement('span');
rem.className = 'icn remove';
- rem.innerHTML = '✕';
+ rem.innerHTML = '✘';
rem.title = 'Enlever ce champ de la fiche';
rem.onclick = function (e) {
if (!window.confirm('Êtes-vous sûr de supprimer ce champ des fiches de membre ?'))
{
return false;
@@ -278,24 +292,10 @@
return false;
};
actions.appendChild(rem);
}
- var edit = document.createElement('span');
- edit.className = 'icn edit';
- edit.innerHTML = '✎';
- edit.title = 'Modifier ce champ';
- edit.onclick = function (e) {
- var content = this.parentNode.parentNode.querySelector('dl');
- if (content.style.display.toLowerCase() == 'none')
- content.style.display = 'block';
- else
- content.style.display = 'none';
- return false;
- };
- actions.appendChild(edit);
-
if (field.querySelector('.options'))
{
var options = field.querySelectorAll('.options li');
var options_nb = options.length;
Index: src/templates/admin/membres/cotisations.tpl
==================================================================
--- src/templates/admin/membres/cotisations.tpl
+++ src/templates/admin/membres/cotisations.tpl
@@ -85,15 +85,15 @@
{if $user.droits.compta >= Garradin\Membres::DROIT_ECRITURE && !empty($c.nb_operations)}
{$c.nb_operations} écritures
{/if}
- Autres cotisants
- | ✘
+ 👪
+ ✘
|
{/foreach}
{/if}
{include file="admin/_foot.tpl"}
Index: src/templates/admin/membres/cotisations/index.tpl
==================================================================
--- src/templates/admin/membres/cotisations/index.tpl
+++ src/templates/admin/membres/cotisations/index.tpl
@@ -32,11 +32,11 @@
{$co.montant|html_money} {$config.monnaie|escape} |
{$co.nb_membres|escape} |
{$co.nb_a_jour|escape} |
- ❓
+ 👪
{if $user.droits.membres >= Garradin\Membres::DROIT_ADMIN}
✎
✘
{/if}
|
Index: src/templates/admin/membres/cotisations/voir.tpl
==================================================================
--- src/templates/admin/membres/cotisations/voir.tpl
+++ src/templates/admin/membres/cotisations/voir.tpl
@@ -24,23 +24,23 @@
{$cotisation.nb_membres|escape}
{if !empty($liste)}
-
+
- ↓↑ |
- Membre ↓↑ |
- Statut ↓↑ |
- Date de cotisation ↓↑ |
+ ↑↓ |
+ Membre ↑↓ |
+ Statut ↑↓ |
+ Date de cotisation ↑↓ |
|
{foreach from=$liste item="co"}
- {$co.id_membre|escape} |
+ {$co.id_membre|escape} |
{$co.nom|escape} |
{if $co.a_jour}À jour{else}En retard{/if} |
{$co.date|format_sqlite_date_to_french} |
Saisir
Index: src/templates/admin/membres/fiche.tpl
==================================================================
--- src/templates/admin/membres/fiche.tpl
+++ src/templates/admin/membres/fiche.tpl
@@ -73,11 +73,11 @@
(Non renseigné)
{elseif $c == 'nom'}
{$membre[$c]|escape}
{elseif $c == 'email'}
{$membre[$c]|escape}
- | Envoyer un message
+ | ✉ Envoyer un message
{elseif $config.type == 'email'}
{$membre[$c]|escape}
{elseif $config.type == 'tel'}
{$membre[$c]|escape|format_tel}
{elseif $config.type == 'country'}
Index: src/templates/admin/membres/index.tpl
==================================================================
--- src/templates/admin/membres/index.tpl
+++ src/templates/admin/membres/index.tpl
@@ -45,15 +45,15 @@
|
Index: src/www/admin/static/admin.css
==================================================================
--- src/www/admin/static/admin.css
+++ src/www/admin/static/admin.css
@@ -1,5 +1,18 @@
+@charset "UTF-8";
+
+@font-face {
+ font-family: 'gicon';
+ src: url('font/garradin.eot?36341436');
+ src: url('font/garradin.eot?36341436#iefix') format('embedded-opentype'),
+ url('font/garradin.woff?36341436') format('woff'),
+ url('font/garradin.ttf?36341436') format('truetype'),
+ url('font/garradin.svg?36341436#garradin') format('svg');
+ font-weight: normal;
+ font-style: normal;
+}
+
body, form, p, div, hr, fieldset, dl, dt, dd, ul, ol, li, h1, h2, h3, h4, h5, h6 {
margin: 0;
padding: 0;
}
h1 { font-size: 2em; }
@@ -18,12 +31,12 @@
html { width: 100%; height: 100%; }
body {
font-size: 100%;
color: #000;
- font-family: "Trebuchet MS", Helvetica, Sans-serif;
- background: #fff;
+ font-family: "Trebuchet MS", Arial, Helvetica, Sans-serif;
+ background: #fff url("bg00.png") repeat-y left bottom;
background: url("bg01.png") no-repeat left -100px, url("bg00.png") repeat-y left bottom, #fff;
padding-bottom: 1em;
}
body#popup {
@@ -54,10 +67,11 @@
text-decoration: none;
}
.header .menu a:hover {
text-decoration: underline;
+ background: rgb(217, 134, 40);
background: rgba(217, 134, 40, 0.5);
}
.header .menu li li a {
font-size: 0.8em;
@@ -67,16 +81,12 @@
.header .menu li.current > a {
background: #fff;
color: rgb(156, 79, 21);
}
-.header .menu a small {
- font-weight: normal;
- opacity: 0.5;
+.header .menu a b {
float: right;
- font-size: .7em;
- padding-top: .3em;
text-decoration: none;
}
.page {
margin: 0px 1em 1em 180px;
@@ -142,10 +152,11 @@
}
fieldset legend {
padding: 0 0.5em;
font-weight: bold;
+ color: #000;
}
label:hover {
cursor: pointer;
border-bottom: 1px dotted #900;
@@ -218,10 +229,11 @@
margin-top: -40px;
}
.loader b {
text-shadow: 2px 2px 5px #999;
+ background: rgb(255, 255, 255);
background: rgba(255, 255, 255, 0.5);
border-radius: .5em;
font-size: 16px;
line-height: 16px;
height: 16px;
@@ -325,10 +337,11 @@
margin: 0 0.2em;
}
ul.actions li a {
display: inline-block;
+ background: rgb(217, 134, 40);
background: rgba(217, 134, 40, .5);
border-radius: .5em .5em 0 0;
padding: .1em .5em;
color: #000;
text-decoration: none;
@@ -371,35 +384,40 @@
text-align: left;
font-weight: bold;
}
table.list thead {
+ background: rgb(217, 134, 40);
background: rgba(217, 134, 40, 0.5);
}
table.list tfoot tr {
+ background: rgb(247, 164, 70);
background: rgba(217, 134, 40, 0.1);
color: rgb(156, 79, 21);
}
table.list th, table.list td {
padding: 0.2em 0.5em;
}
table.list tr {
+ border: 1px solid rgb(217, 134, 40);
border: 1px solid rgba(217, 134, 40, 0.5);
}
table.list tr:nth-child(even) {
+ background: rgb(255, 174, 80);
background: rgba(217, 134, 40, 0.2);
}
table.list.multi tr:nth-child(even) {
background: inherit;
}
table.list.multi tr:nth-child(4n+1), table.list.multi tr:nth-child(4n+2) {
+ background: rgb(255, 174, 80);
background: rgba(217, 134, 40, 0.2);
}
table.list .error {
color: red;
@@ -422,39 +440,45 @@
table.list .check {
width: 1%;
}
table.search th {
+ background: rgb(217, 134, 40);
background: rgba(217, 134, 40, 0.5);
}
-table.list thead .cur {
+.userOrder .cur {
background: rgb(217, 134, 40);
color: #fff;
}
-table.list thead th a, table.list thead td a {
- display: inline-block;
- color: #000;
+.userOrder td, .userOrder th {
+ position: relative;
+}
+
+.userOrder .icn {
+ float: left;
+ clear: left;
+ color: #9c4f15;
text-decoration: none;
- font-size: 10pt;
+ font-size: 12pt;
+ line-height: 6pt;
+ width: 12pt;
+ height: 8pt;
+ vertical-align: middle;
font-weight: normal;
- background: #ccc;
- border: 1px outset #999;
- margin: 0 .1em;
- padding: 0 .1em;
+ text-shadow: 0px 0px 1px #fff;
}
-table.list thead th a:hover, table.list thead td a:hover {
- background: #999;
- border-color: #333;
+thead .icn:hover {
+ color: darkred;
+ text-shadow: none;
}
-table.list thead .cur.desc a:nth-child(2), table.list thead .cur.asc a:nth-child(1) {
- font-weight: bold;
- background: #999;
+thead .cur.desc .icn.dn, thead .cur.asc .icn.up {
color: #fff;
+ text-shadow: none;
}
table.list .actions {
text-align: right;
}
@@ -477,11 +501,12 @@
#rapport tr {
vertical-align: top;
}
#rapport table table {
- border: 1px solid rgba(217, 134, 40, 0.5);
+ border: 1px solid rgb(217, 134, 40);
+ border-color: rgba(217, 134, 40, 0.5);
}
#rapport table table tr th {
width: 80%;
}
@@ -499,14 +524,16 @@
text-align: right;
}
#rapport .parent {
font-weight: bold;
+ background: rgb(247, 164, 70);
background: rgba(217, 134, 40, 0.2);
}
#rapport table table tfoot tr {
+ background: rgb(247, 164, 70);
background: rgba(217, 134, 40, 0.1);
color: rgb(156, 79, 21);
}
#rapport .exercice {
@@ -518,32 +545,44 @@
#rapport h1 {
text-align: center;
}
-.actions .icn {
+.icn {
+ font-family: "gicon", sans-serif;
+ font-style: normal;
+ font-weight: normal;
+ speak: none;
+ font-variant: normal;
+ text-transform: none;
+}
+
+.actions .icn, .icn.action {
text-decoration: none;
border-radius: 1em;
- width: 1.2em;
display: inline-block;
text-align: center;
font-size: 1.2em;
line-height: .8em;
vertical-align: middle;
padding: .2em;
+ font-family: "gicon", sans-serif;
+ color: #9c4f15;
+ text-shadow: 1px 1px 1px #999;
}
.num a {
text-decoration: none;
border-radius: .5em;
display: inline-block;
text-align: center;
padding: 0 .2em;
+ background: rgb(247, 164, 70);
background: rgba(217, 134, 40, 0.5);
}
-.actions .icn:hover, .num a:hover {
+.actions .icn:hover, .num a:hover, .icn.action:hover {
color: darkred;
background: #ff9;
}
@@ -558,10 +597,11 @@
font-size: 0.8em;
cursor: help;
vertical-align: middle;
position: relative;
z-index: 10;
+ font-family: "gicon", "Trebuchet MS", Arial, Helvetica, sans-serif;
}
.droits b.aucun {
border-color: #ccc;
background: #eee;
@@ -1034,10 +1074,11 @@
dl.describe ul {
margin-left: 1em;
}
dl.cotisation {
+ background: rgb(255, 174, 80);
background: rgba(217, 134, 40, 0.2);
padding: .5em;
border-radius: .5em;
margin: 1em;
}
@@ -1061,18 +1102,33 @@
#orderFields fieldset {
position: relative;
min-height: 2em;
}
+
+#orderFields fieldset legend {
+ font-size: 1.2em;
+ line-height: .8em;
+ color: #666;
+}
#orderFields fieldset .actions {
display: block;
position: absolute;
top: 1em;
right: 1em;
}
+#orderFields fieldset .actions .icn {
+ position: absolute;
+}
+
+#orderFields fieldset .actions .remove { right: 0em; }
+#orderFields fieldset .actions .edit { right: 1.5em; }
+#orderFields fieldset .actions .down { right: 3em; }
+#orderFields fieldset .actions .up { right: 4.5em; }
+
#orderFields fieldset:nth-child(1) .actions .up, #orderFields fieldset:nth-last-child(1) .actions .down {
display: none;
}
#orderFields fieldset .actions .icn {
ADDED src/www/admin/static/font/garradin.css
Index: src/www/admin/static/font/garradin.css
==================================================================
--- src/www/admin/static/font/garradin.css
+++ src/www/admin/static/font/garradin.css
@@ -0,0 +1,63 @@
+@charset "UTF-8";
+
+ @font-face {
+ font-family: 'garradin';
+ src: url('../font/garradin.eot?36341436');
+ src: url('../font/garradin.eot?36341436#iefix') format('embedded-opentype'),
+ url('../font/garradin.woff?36341436') format('woff'),
+ url('../font/garradin.ttf?36341436') format('truetype'),
+ url('../font/garradin.svg?36341436#garradin') format('svg');
+ font-weight: normal;
+ font-style: normal;
+}
+/* Chrome hack: SVG is rendered more smooth in Windozze. 100% magic, uncomment if you need it. */
+/* Note, that will break hinting! In other OS-es font will be not as sharp as it could be */
+/*
+@media screen and (-webkit-min-device-pixel-ratio:0) {
+ @font-face {
+ font-family: 'garradin';
+ src: url('../font/garradin.svg?36341436#garradin') format('svg');
+ }
+}
+*/
+
+ [class^="icn-"]:before, [class*=" icn-"]:before {
+ font-family: "garradin";
+ font-style: normal;
+ font-weight: normal;
+ speak: none;
+
+ display: inline-block;
+ text-decoration: inherit;
+ width: 1em;
+ margin-right: .2em;
+ text-align: center;
+ /* opacity: .8; */
+
+ /* For safety - reset parent styles, that can break glyph codes*/
+ font-variant: normal;
+ text-transform: none;
+}
+
+.icn-search:before { content: '🔍'; } /* '\1f50d' */
+.icn-user:before { content: '👤'; } /* '\1f464' */
+.icn-users:before { content: '👪'; } /* '\1f46a' */
+.icn-delete:before { content: '\2718'; } /* '✘' */
+.icn-plus:before { content: '\2795'; } /* '➕' */
+.icn-minus:before { content: '\2796'; } /* '➖' */
+.icn-help:before { content: '\2753'; } /* '❓' */
+.icn-home:before { content: '\2302'; } /* '⌂' */
+.icn-attach:before { content: '📎'; } /* '\1f4ce' */
+.icn-lock:before { content: '🔒'; } /* '\1f512' */
+.icn-mail:before { content: '\2709'; } /* '✉' */
+.icn-download:before { content: '\21d3'; } /* '⇓' */
+.icn-edit:before { content: '\270e'; } /* '✎' */
+.icn-print:before { content: '\2399'; } /* '⎙' */
+.icn-alert:before { content: '\26a0'; } /* '⚠' */
+.icn-menu:before { content: '𝍢'; } /* '\1d362' */
+.icn-settings:before { content: '\2638'; } /* '☸' */
+.icn-down:before { content: '\2193'; } /* '↓' */
+.icn-up:before { content: '\2191'; } /* '↑' */
+.icn-logout:before { content: '\291d'; } /* '⤝' */
+.icn-check:before { content: '\2611'; } /* '☑' */
+.icn-unlock:before { content: '🔓'; } /* '\1f513' */
ADDED src/www/admin/static/font/garradin.eot
Index: src/www/admin/static/font/garradin.eot
==================================================================
--- src/www/admin/static/font/garradin.eot
+++ src/www/admin/static/font/garradin.eot
cannot compute difference between binary files
ADDED src/www/admin/static/font/garradin.svg
Index: src/www/admin/static/font/garradin.svg
==================================================================
--- src/www/admin/static/font/garradin.svg
+++ src/www/admin/static/font/garradin.svg
@@ -0,0 +1,33 @@
+
+
+
ADDED src/www/admin/static/font/garradin.ttf
Index: src/www/admin/static/font/garradin.ttf
==================================================================
--- src/www/admin/static/font/garradin.ttf
+++ src/www/admin/static/font/garradin.ttf
cannot compute difference between binary files
ADDED src/www/admin/static/font/garradin.woff
Index: src/www/admin/static/font/garradin.woff
==================================================================
--- src/www/admin/static/font/garradin.woff
+++ src/www/admin/static/font/garradin.woff
cannot compute difference between binary files