Skip to content

Commit

Permalink
smartpocket, configuration: simpler yes/no checkboxes (with fontello …
Browse files Browse the repository at this point in the history 
…icons, same as AdminTools checkboxes)

git-svn-id: http://piwigo.org/svn/trunk@25752 68402e56-0260-453c-a942-63ccdbb3a9ee
  • Loading branch information
@plegall
plegall committed Nov 29, 2013
1 parent f1cb641 commit d700b89
Show file tree
Hide file tree
Showing 14 changed files with 157 additions and 76 deletions.
19 changes: 14 additions & 5 deletions admin/themes/default/fontello/LICENSE.txt
View file
@@ -1,13 +1,13 @@
Font license info


## Font Awesome
## Fontelico

Copyright (C) 2012 by Dave Gandy
Copyright (C) 2012 by Fontello project

Author: Dave Gandy
License: SIL ()
Homepage: http://fortawesome.github.com/Font-Awesome/
Author: Crowdsourced, for Fontello project
License: SIL (http://scripts.sil.org/OFL)
Homepage: http://fontello.com


## Elusive
Expand All @@ -19,6 +19,15 @@ Font license info
Homepage: http://aristeides.com/


## Font Awesome

Copyright (C) 2012 by Dave Gandy

Author: Dave Gandy
License: SIL ()
Homepage: http://fortawesome.github.com/Font-Awesome/


## Entypo

Copyright (C) 2012 by Daniel Bruce
Expand Down
24 changes: 24 additions & 0 deletions admin/themes/default/fontello/config.json
View file
Expand Up @@ -6,6 +6,12 @@
"units_per_em": 1000,
"ascent": 850,
"glyphs": [
{
"uid": "9bc2902722abb366a213a052ade360bc",
"css": "spin6",
"code": 59421,
"src": "fontelico"
},
{
"uid": "bf882b30900da12fca090d9796bc3030",
"css": "mail",
Expand Down Expand Up @@ -204,6 +210,18 @@
"code": 61733,
"src": "fontawesome"
},
{
"uid": "dd6c6b221a1088ff8a9b9cd32d0b3dd5",
"css": "check",
"code": 59423,
"src": "fontawesome"
},
{
"uid": "4b900d04e8ab8c82f080c1cfbac5772c",
"css": "check-empty",
"code": 59424,
"src": "fontawesome"
},
{
"uid": "9396b2d8849e0213a0f11c5fd7fcc522",
"css": "tasks",
Expand Down Expand Up @@ -276,6 +294,12 @@
"code": 59395,
"src": "entypo"
},
{
"uid": "7f6916533c0842b6cec699fd773693d3",
"css": "hourglass",
"code": 59422,
"src": "entypo"
},
{
"uid": "414fe97e4af5215a06d29be0f2cecdf5",
"css": "network",
Expand Down
12 changes: 8 additions & 4 deletions admin/themes/default/fontello/css/fontello-codes.css
View file
@@ -1,8 +1,9 @@
@charset "UTF-8";


.icon-mail:before { content: '\2709'; } /* '✉' */
.icon-spin6:before { content: '\e81d'; } /* '' */
.icon-asl:before { content: '\e0ad'; } /* '' */
.icon-mail-alt:before { content: '\f0e0'; } /* '' */
.icon-star:before { content: '\2605'; } /* '★' */
.icon-star-empty:before { content: '\2606'; } /* '☆' */
.icon-user:before { content: '👤'; } /* '\1f464' */
Expand All @@ -29,11 +30,13 @@
.icon-angle-circled-up:before { content: '\e819'; } /* '' */
.icon-angle-circled-down:before { content: '\e818'; } /* '' */
.icon-cw:before { content: '\e80c'; } /* '' */
.icon-mail-alt:before { content: '\f0e0'; } /* '' */
.icon-shuffle:before { content: '🔀'; } /* '\1f500' */
.icon-arrows-cw:before { content: '\e804'; } /* '' */
.icon-mail:before { content: '\2709'; } /* '✉' */
.icon-exchange:before { content: '\e805'; } /* '' */
.icon-signal:before { content: '\e801'; } /* '' */
.icon-crop:before { content: '\f125'; } /* '' */
.icon-check:before { content: '\e81f'; } /* '' */
.icon-check-empty:before { content: '\e820'; } /* '' */
.icon-tasks:before { content: '\f0ae'; } /* '' */
.icon-filter:before { content: '\f0b0'; } /* '' */
.icon-sitemap:before { content: '\f0e8'; } /* '' */
Expand All @@ -46,6 +49,7 @@
.icon-upload:before { content: '\e813'; } /* '' */
.icon-upload-cloud:before { content: '\e814'; } /* '' */
.icon-tools:before { content: '\e803'; } /* '' */
.icon-hourglass:before { content: '\e81e'; } /* '' */
.icon-network:before { content: '\e816'; } /* '' */
.icon-brush:before { content: '\e807'; } /* '' */
.icon-language:before { content: '\e800'; } /* '' */
Expand All @@ -56,4 +60,4 @@
.icon-equalizer:before { content: '\e80f'; } /* '' */
.icon-users:before { content: '\e802'; } /* '' */
.icon-group:before { content: '\e80d'; } /* '' */
.icon-arrows-cw:before { content: '\e804'; } /* '' */
.icon-shuffle:before { content: '🔀'; } /* '\1f500' */
24 changes: 14 additions & 10 deletions admin/themes/default/fontello/css/fontello-embedded.css
View file

Large diffs are not rendered by default.

12 changes: 8 additions & 4 deletions admin/themes/default/fontello/css/fontello-ie7-codes.css
View file
@@ -1,6 +1,7 @@

.icon-mail { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '✉ '); }
.icon-spin6 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-asl { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-mail-alt { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-star { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '★ '); }
.icon-star-empty { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '☆ '); }
.icon-user { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '👤 '); }
Expand All @@ -27,11 +28,13 @@
.icon-angle-circled-up { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-angle-circled-down { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-cw { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-mail-alt { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-shuffle { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '🔀 '); }
.icon-arrows-cw { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-mail { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '✉ '); }
.icon-exchange { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-signal { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-crop { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-check { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-check-empty { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-tasks { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-filter { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-sitemap { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
Expand All @@ -44,6 +47,7 @@
.icon-upload { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-upload-cloud { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-tools { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-hourglass { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-network { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-brush { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-language { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
Expand All @@ -54,4 +58,4 @@
.icon-equalizer { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-users { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-group { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-arrows-cw { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-shuffle { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '🔀 '); }
12 changes: 8 additions & 4 deletions admin/themes/default/fontello/css/fontello-ie7.css
View file
Expand Up @@ -10,8 +10,9 @@
/* font-size: 120%; */
}

.icon-mail { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '✉ '); }
.icon-spin6 { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-asl { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-mail-alt { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-star { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '★ '); }
.icon-star-empty { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '☆ '); }
.icon-user { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '👤 '); }
Expand All @@ -38,11 +39,13 @@
.icon-angle-circled-up { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-angle-circled-down { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-cw { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-mail-alt { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-shuffle { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '🔀 '); }
.icon-arrows-cw { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-mail { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '✉ '); }
.icon-exchange { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-signal { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-crop { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-check { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-check-empty { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-tasks { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-filter { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-sitemap { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
Expand All @@ -55,6 +58,7 @@
.icon-upload { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-upload-cloud { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-tools { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-hourglass { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-network { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-brush { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-language { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
Expand All @@ -65,4 +69,4 @@
.icon-equalizer { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-users { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-group { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-arrows-cw { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = ' '); }
.icon-shuffle { *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '🔀 '); }
24 changes: 14 additions & 10 deletions admin/themes/default/fontello/css/fontello.css
View file
Expand Up @@ -2,11 +2,11 @@

@font-face {
font-family: 'fontello';
src: url('../font/fontello.eot?70202030');
src: url('../font/fontello.eot?70202030#iefix') format('embedded-opentype'),
url('../font/fontello.woff?70202030') format('woff'),
url('../font/fontello.ttf?70202030') format('truetype'),
url('../font/fontello.svg?70202030#fontello') format('svg');
src: url('../font/fontello.eot?9585454');
src: url('../font/fontello.eot?9585454#iefix') format('embedded-opentype'),
url('../font/fontello.woff?9585454') format('woff'),
url('../font/fontello.ttf?9585454') format('truetype'),
url('../font/fontello.svg?9585454#fontello') format('svg');
font-weight: normal;
font-style: normal;
}
Expand All @@ -16,7 +16,7 @@
@media screen and (-webkit-min-device-pixel-ratio:0) {
@font-face {
font-family: 'fontello';
src: url('../font/fontello.svg?70202030#fontello') format('svg');
src: url('../font/fontello.svg?9585454#fontello') format('svg');
}
}
*/
Expand Down Expand Up @@ -52,8 +52,9 @@
/* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */
}

.icon-mail:before { content: '\2709'; } /* '✉' */
.icon-spin6:before { content: '\e81d'; } /* '' */
.icon-asl:before { content: '\e0ad'; } /* '' */
.icon-mail-alt:before { content: '\f0e0'; } /* '' */
.icon-star:before { content: '\2605'; } /* '★' */
.icon-star-empty:before { content: '\2606'; } /* '☆' */
.icon-user:before { content: '👤'; } /* '\1f464' */
Expand All @@ -80,11 +81,13 @@
.icon-angle-circled-up:before { content: '\e819'; } /* '' */
.icon-angle-circled-down:before { content: '\e818'; } /* '' */
.icon-cw:before { content: '\e80c'; } /* '' */
.icon-mail-alt:before { content: '\f0e0'; } /* '' */
.icon-shuffle:before { content: '🔀'; } /* '\1f500' */
.icon-arrows-cw:before { content: '\e804'; } /* '' */
.icon-mail:before { content: '\2709'; } /* '✉' */
.icon-exchange:before { content: '\e805'; } /* '' */
.icon-signal:before { content: '\e801'; } /* '' */
.icon-crop:before { content: '\f125'; } /* '' */
.icon-check:before { content: '\e81f'; } /* '' */
.icon-check-empty:before { content: '\e820'; } /* '' */
.icon-tasks:before { content: '\f0ae'; } /* '' */
.icon-filter:before { content: '\f0b0'; } /* '' */
.icon-sitemap:before { content: '\f0e8'; } /* '' */
Expand All @@ -97,6 +100,7 @@
.icon-upload:before { content: '\e813'; } /* '' */
.icon-upload-cloud:before { content: '\e814'; } /* '' */
.icon-tools:before { content: '\e803'; } /* '' */
.icon-hourglass:before { content: '\e81e'; } /* '' */
.icon-network:before { content: '\e816'; } /* '' */
.icon-brush:before { content: '\e807'; } /* '' */
.icon-language:before { content: '\e800'; } /* '' */
Expand All @@ -107,4 +111,4 @@
.icon-equalizer:before { content: '\e80f'; } /* '' */
.icon-users:before { content: '\e802'; } /* '' */
.icon-group:before { content: '\e80d'; } /* '' */
.icon-arrows-cw:before { content: '\e804'; } /* '' */
.icon-shuffle:before { content: '🔀'; } /* '\1f500' */

0 comments on commit d700b89

Please sign in to comment.