From: vincent@cubedesigners.com Date: Tue, 5 Jun 2012 09:49:12 +0000 (+0000) Subject: (no commit message) X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=3c5fffa236aa2f552e6ff62377c505c513da5057;p=cubeextranet.git --- diff --git a/fluidbook/icones/7/mobile/help-fingers.svg b/fluidbook/icones/7/mobile/help-fingers.svg new file mode 100644 index 000000000..f45e6d2fe --- /dev/null +++ b/fluidbook/icones/7/mobile/help-fingers.svg @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/fluidbook/icones/7/mobile/help-mouse.svg b/fluidbook/icones/7/mobile/help-mouse.svg new file mode 100644 index 000000000..eb6d44b4b --- /dev/null +++ b/fluidbook/icones/7/mobile/help-mouse.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + diff --git a/fluidbook/icones/7/mobile/nav-bookmark.svg b/fluidbook/icones/7/mobile/nav-bookmark.svg new file mode 100644 index 000000000..0ff3bd47d --- /dev/null +++ b/fluidbook/icones/7/mobile/nav-bookmark.svg @@ -0,0 +1,8 @@ + + + + + + diff --git a/fluidbook/icones/7/mobile/nav-facebook.svg b/fluidbook/icones/7/mobile/nav-facebook.svg new file mode 100644 index 000000000..c2d1399ac --- /dev/null +++ b/fluidbook/icones/7/mobile/nav-facebook.svg @@ -0,0 +1,11 @@ + + + + + + diff --git a/fluidbook/icones/7/mobile/nav-friend.svg b/fluidbook/icones/7/mobile/nav-friend.svg new file mode 100644 index 000000000..3593791ca --- /dev/null +++ b/fluidbook/icones/7/mobile/nav-friend.svg @@ -0,0 +1,8 @@ + + + + + + diff --git a/fluidbook/icones/7/mobile/nav-help.svg b/fluidbook/icones/7/mobile/nav-help.svg new file mode 100644 index 000000000..4b04058d8 --- /dev/null +++ b/fluidbook/icones/7/mobile/nav-help.svg @@ -0,0 +1,17 @@ + + + + + + diff --git a/fluidbook/icones/7/mobile/nav-index.svg b/fluidbook/icones/7/mobile/nav-index.svg new file mode 100644 index 000000000..5d3c042f6 --- /dev/null +++ b/fluidbook/icones/7/mobile/nav-index.svg @@ -0,0 +1,17 @@ + + + + + + + + + + diff --git a/fluidbook/icones/7/mobile/nav-sommaire.svg b/fluidbook/icones/7/mobile/nav-sommaire.svg new file mode 100644 index 000000000..d824beaf1 --- /dev/null +++ b/fluidbook/icones/7/mobile/nav-sommaire.svg @@ -0,0 +1,17 @@ + + + + + + + + + + diff --git a/fluidbook/icones/7/mobile/nav-twitter.svg b/fluidbook/icones/7/mobile/nav-twitter.svg new file mode 100644 index 000000000..97bcabe54 --- /dev/null +++ b/fluidbook/icones/7/mobile/nav-twitter.svg @@ -0,0 +1,15 @@ + + + + + + diff --git a/fluidbook/icones/7/mobile/next.svg b/fluidbook/icones/7/mobile/next.svg new file mode 100644 index 000000000..fc1617f4b --- /dev/null +++ b/fluidbook/icones/7/mobile/next.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + diff --git a/fluidbook/icones/7/mobile/previous.svg b/fluidbook/icones/7/mobile/previous.svg new file mode 100644 index 000000000..d68cb27d1 --- /dev/null +++ b/fluidbook/icones/7/mobile/previous.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + diff --git a/fluidbook/icones/7/mobile/search.svg b/fluidbook/icones/7/mobile/search.svg new file mode 100644 index 000000000..ed50b69aa --- /dev/null +++ b/fluidbook/icones/7/mobile/search.svg @@ -0,0 +1,10 @@ + + + + + + diff --git a/fluidbook/icones/7/nav-2d.png b/fluidbook/icones/7/nav-2d.png new file mode 100644 index 000000000..f1413d6a2 Binary files /dev/null and b/fluidbook/icones/7/nav-2d.png differ diff --git a/fluidbook/icones/7/nav-3d.png b/fluidbook/icones/7/nav-3d.png new file mode 100644 index 000000000..b296ea000 Binary files /dev/null and b/fluidbook/icones/7/nav-3d.png differ diff --git a/fluidbook/icones/7/nav-archives.png b/fluidbook/icones/7/nav-archives.png new file mode 100644 index 000000000..a8047def7 Binary files /dev/null and b/fluidbook/icones/7/nav-archives.png differ diff --git a/fluidbook/icones/7/nav-basket.png b/fluidbook/icones/7/nav-basket.png new file mode 100644 index 000000000..e3bee65f1 Binary files /dev/null and b/fluidbook/icones/7/nav-basket.png differ diff --git a/fluidbook/icones/7/nav-bookmark.png b/fluidbook/icones/7/nav-bookmark.png new file mode 100644 index 000000000..e9663f751 Binary files /dev/null and b/fluidbook/icones/7/nav-bookmark.png differ diff --git a/fluidbook/icones/7/nav-friend.png b/fluidbook/icones/7/nav-friend.png new file mode 100644 index 000000000..05de3ae49 Binary files /dev/null and b/fluidbook/icones/7/nav-friend.png differ diff --git a/fluidbook/icones/7/nav-fullscreen.png b/fluidbook/icones/7/nav-fullscreen.png new file mode 100644 index 000000000..c710a0c52 Binary files /dev/null and b/fluidbook/icones/7/nav-fullscreen.png differ diff --git a/fluidbook/icones/7/nav-help.png b/fluidbook/icones/7/nav-help.png new file mode 100644 index 000000000..ebc0bb1ec Binary files /dev/null and b/fluidbook/icones/7/nav-help.png differ diff --git a/fluidbook/icones/7/nav-index.png b/fluidbook/icones/7/nav-index.png new file mode 100644 index 000000000..289c57b6e Binary files /dev/null and b/fluidbook/icones/7/nav-index.png differ diff --git a/fluidbook/icones/7/nav-normal.png b/fluidbook/icones/7/nav-normal.png new file mode 100644 index 000000000..93757c3fb Binary files /dev/null and b/fluidbook/icones/7/nav-normal.png differ diff --git a/fluidbook/icones/7/nav-normalscreen.png b/fluidbook/icones/7/nav-normalscreen.png new file mode 100644 index 000000000..5fbf6ef91 Binary files /dev/null and b/fluidbook/icones/7/nav-normalscreen.png differ diff --git a/fluidbook/icones/7/nav-previous.png b/fluidbook/icones/7/nav-previous.png new file mode 100644 index 000000000..d0fbed637 Binary files /dev/null and b/fluidbook/icones/7/nav-previous.png differ diff --git a/fluidbook/icones/7/nav-print.png b/fluidbook/icones/7/nav-print.png new file mode 100644 index 000000000..49ed8be48 Binary files /dev/null and b/fluidbook/icones/7/nav-print.png differ diff --git a/fluidbook/icones/7/nav-save.png b/fluidbook/icones/7/nav-save.png new file mode 100644 index 000000000..a84fd0197 Binary files /dev/null and b/fluidbook/icones/7/nav-save.png differ diff --git a/fluidbook/icones/7/nav-sommaire.png b/fluidbook/icones/7/nav-sommaire.png new file mode 100644 index 000000000..00397480f Binary files /dev/null and b/fluidbook/icones/7/nav-sommaire.png differ diff --git a/fluidbook/icones/7/nav-soundoff.png b/fluidbook/icones/7/nav-soundoff.png new file mode 100644 index 000000000..d79d25e94 Binary files /dev/null and b/fluidbook/icones/7/nav-soundoff.png differ diff --git a/fluidbook/icones/7/nav-soundon.png b/fluidbook/icones/7/nav-soundon.png new file mode 100644 index 000000000..cc787a5dd Binary files /dev/null and b/fluidbook/icones/7/nav-soundon.png differ diff --git a/fluidbook/icones/7/nav-zoomin.png b/fluidbook/icones/7/nav-zoomin.png new file mode 100644 index 000000000..a3d2c0a52 Binary files /dev/null and b/fluidbook/icones/7/nav-zoomin.png differ diff --git a/fluidbook/icones/7/nav-zoomout.png b/fluidbook/icones/7/nav-zoomout.png new file mode 100644 index 000000000..f90287fd7 Binary files /dev/null and b/fluidbook/icones/7/nav-zoomout.png differ diff --git a/fluidbook/icones/7/v1/nav-bookmark-off.png b/fluidbook/icones/7/v1/nav-bookmark-off.png new file mode 100644 index 000000000..ac99df894 Binary files /dev/null and b/fluidbook/icones/7/v1/nav-bookmark-off.png differ diff --git a/fluidbook/icones/7/v1/nav-bookmark-on.png b/fluidbook/icones/7/v1/nav-bookmark-on.png new file mode 100644 index 000000000..775df3543 Binary files /dev/null and b/fluidbook/icones/7/v1/nav-bookmark-on.png differ diff --git a/fluidbook/icones/7/v1/nav-help-off.png b/fluidbook/icones/7/v1/nav-help-off.png new file mode 100644 index 000000000..aad6eeac4 Binary files /dev/null and b/fluidbook/icones/7/v1/nav-help-off.png differ diff --git a/fluidbook/icones/7/v1/nav-help-on.png b/fluidbook/icones/7/v1/nav-help-on.png new file mode 100644 index 000000000..77a84e0fb Binary files /dev/null and b/fluidbook/icones/7/v1/nav-help-on.png differ diff --git a/fluidbook/icones/7/v1/nav-index-off.png b/fluidbook/icones/7/v1/nav-index-off.png new file mode 100644 index 000000000..b3d24f3eb Binary files /dev/null and b/fluidbook/icones/7/v1/nav-index-off.png differ diff --git a/fluidbook/icones/7/v1/nav-index-on.png b/fluidbook/icones/7/v1/nav-index-on.png new file mode 100644 index 000000000..6ac159536 Binary files /dev/null and b/fluidbook/icones/7/v1/nav-index-on.png differ diff --git a/fluidbook/icones/7/v1/nav-normal-off.png b/fluidbook/icones/7/v1/nav-normal-off.png new file mode 100644 index 000000000..3365d8f31 Binary files /dev/null and b/fluidbook/icones/7/v1/nav-normal-off.png differ diff --git a/fluidbook/icones/7/v1/nav-normal-on.png b/fluidbook/icones/7/v1/nav-normal-on.png new file mode 100644 index 000000000..18583f0e1 Binary files /dev/null and b/fluidbook/icones/7/v1/nav-normal-on.png differ diff --git a/fluidbook/icones/7/v1/nav-pdf-off.png b/fluidbook/icones/7/v1/nav-pdf-off.png new file mode 100644 index 000000000..60fac52f5 Binary files /dev/null and b/fluidbook/icones/7/v1/nav-pdf-off.png differ diff --git a/fluidbook/icones/7/v1/nav-pdf-on.png b/fluidbook/icones/7/v1/nav-pdf-on.png new file mode 100644 index 000000000..a4c344462 Binary files /dev/null and b/fluidbook/icones/7/v1/nav-pdf-on.png differ diff --git a/fluidbook/icones/7/v1/nav-print-off.png b/fluidbook/icones/7/v1/nav-print-off.png new file mode 100644 index 000000000..fa7f35f75 Binary files /dev/null and b/fluidbook/icones/7/v1/nav-print-off.png differ diff --git a/fluidbook/icones/7/v1/nav-print-on.png b/fluidbook/icones/7/v1/nav-print-on.png new file mode 100644 index 000000000..93e1f603f Binary files /dev/null and b/fluidbook/icones/7/v1/nav-print-on.png differ diff --git a/fluidbook/icones/7/v1/nav-search-off.png b/fluidbook/icones/7/v1/nav-search-off.png new file mode 100644 index 000000000..f5799da4a Binary files /dev/null and b/fluidbook/icones/7/v1/nav-search-off.png differ diff --git a/fluidbook/icones/7/v1/nav-search-on.png b/fluidbook/icones/7/v1/nav-search-on.png new file mode 100644 index 000000000..42c9f8ffb Binary files /dev/null and b/fluidbook/icones/7/v1/nav-search-on.png differ diff --git a/fluidbook/icones/7/v1/nav-send-off.png b/fluidbook/icones/7/v1/nav-send-off.png new file mode 100644 index 000000000..e1f71ea9a Binary files /dev/null and b/fluidbook/icones/7/v1/nav-send-off.png differ diff --git a/fluidbook/icones/7/v1/nav-send-on.png b/fluidbook/icones/7/v1/nav-send-on.png new file mode 100644 index 000000000..9a0dbe4e0 Binary files /dev/null and b/fluidbook/icones/7/v1/nav-send-on.png differ diff --git a/fluidbook/icones/7/v1/nav-sommaire-off.png b/fluidbook/icones/7/v1/nav-sommaire-off.png new file mode 100644 index 000000000..9e728d951 Binary files /dev/null and b/fluidbook/icones/7/v1/nav-sommaire-off.png differ diff --git a/fluidbook/icones/7/v1/nav-sommaire-on.png b/fluidbook/icones/7/v1/nav-sommaire-on.png new file mode 100644 index 000000000..cfe2bfc99 Binary files /dev/null and b/fluidbook/icones/7/v1/nav-sommaire-on.png differ diff --git a/fluidbook/icones/7/v1/nav-zoomin-off.png b/fluidbook/icones/7/v1/nav-zoomin-off.png new file mode 100644 index 000000000..1c243f975 Binary files /dev/null and b/fluidbook/icones/7/v1/nav-zoomin-off.png differ diff --git a/fluidbook/icones/7/v1/nav-zoomin-on.png b/fluidbook/icones/7/v1/nav-zoomin-on.png new file mode 100644 index 000000000..436e782cc Binary files /dev/null and b/fluidbook/icones/7/v1/nav-zoomin-on.png differ diff --git a/fluidbook/icones/7/v1/nav-zoomout-off.png b/fluidbook/icones/7/v1/nav-zoomout-off.png new file mode 100644 index 000000000..444be1030 Binary files /dev/null and b/fluidbook/icones/7/v1/nav-zoomout-off.png differ diff --git a/fluidbook/icones/7/v1/nav-zoomout-on.png b/fluidbook/icones/7/v1/nav-zoomout-on.png new file mode 100644 index 000000000..363b64d3b Binary files /dev/null and b/fluidbook/icones/7/v1/nav-zoomout-on.png differ diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php index 7931d5934..c3ddced63 100644 --- a/inc/ws/Controlleur/class.ws.flash.php +++ b/inc/ws/Controlleur/class.ws.flash.php @@ -348,10 +348,10 @@ class wsFlash extends cubeFlashGateway { } else { $mine = false; } - if (wsDroits::admin()) { - $right = 'w'; - } elseif (in_array($theme->theme_id, $demos)) { + if (in_array($theme->theme_id, $demos)) { $right = 'r'; + } elseif (wsDroits::admin()) { + $right = 'w'; } elseif (in_array($theme->theme_id, $readOnly)) { $right = 'r'; } elseif (wsDroits::revendeur() && wsDroits::creation()) { @@ -359,6 +359,9 @@ class wsFlash extends cubeFlashGateway { } else { $right = 'r'; } + + + $t->addAttribute('right', $right); $t->addAttribute('proprietaire', $theme->proprietaire_nom); $t->addAttribute('books', max(($theme->nbBooks) - ($mine ? 1 : 0), 0));