wip #1254 @0.5

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 36e650b38b95a8e27dff5576641e132c08b75222..1fd96e2eb62557b51579c4f472092530d11d4ae6 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -131,15 +131,7 @@ class wsUrl {
                                $res .= '<td>' . $book->version . '</td>';
                        }
                        if ($book->version > 1 || $droits->admin) {
-                               if ($droits->admin) {
-                                       $res .= '<td class="bouton"><a href="/viewer/' . $book->book_id . '_' . $book->hash . '/" class="openContextMenu voir btbook" rel="' . $context_view_id . '" rev="' . $book->book_id . '§' . $book->hash . '§' . TIME . '">' . $btVoir . '</a></td>';
-                               } else {
-                                       $viewURL = SITE_PATH . 'viewer/' . $book->book_id . '_' . $book->hash;
-                                       if ($book->parametres->version == 1) {
-                                               $viewURL = SITE_PATH . 'viewer1/' . $book->book_id . '_' . $book->hash;
-                                       }
-                                       $res .= '<td class="bouton"><a class="popupFSBar voir btbook" rel="toolbar=yes" rev="viewer_' . $book->book_id . '" href="' . $viewURL . '/">' . $btVoir . '</a></td>';
-                               }
+                               $res .= '<td class="bouton"><a href="/viewer/' . $book->book_id . '_' . $book->hash . '/" class="openContextMenu voir btbook" rel="' . $context_view_id . '" rev="' . $book->book_id . '§' . $book->hash . '§' . TIME . '">' . $btVoir . '</a></td>';
                                $res .= '<td class="bouton"><a class="popupFSBar edit btbook" rel="toolbar=yes" rev="editor_' . $book->book_id . '" href="' . SITE_PATH . 'editor/' . $book->book_id . '_' . $book->hash . '">' . $btEdit . '</a></td>';
                        } else {
                                $res .= '<td></td><td></td>';
@@ -592,6 +584,11 @@ class wsUrl {
                                         //array('version' => 'viewerhu', 'title' => __('Widget HTML5'), 'icon' => cubeMedia::image(IMG . '/html5bug.png'), 'file' => 'widget.html', 'pattern' => '$1_$2_$3'),
                                         array('version' => 'viewer1', 'title' => __('Version 1'), 'icon' => cubeMedia::image(IMG . '/flash.png'))
                        );
+               } else {
+                       $viewers = array(array('version' => 'viewer', 'title' => __('Version Flash'), 'icon' => cubeMedia::image(IMG . '/flash.png')),
+                                        array('version' => 'viewerh', 'title' => __('Version HTML5'), 'icon' => cubeMedia::image(IMG . '/html5.png'))
+                       );
+
                }
 
                $res = '<div class="contextMenu viewbookContextMenu" id="' . $id . '">';

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index aea4d5fed4fc604f86619c88b110032d3be27301..40bbdecbfae83f4eca4f108ed14b8e12a4f8a61d 100644 (file)
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -88,7 +88,7 @@ class wsBookParametres extends wsParametres {
                                                                            __('Mode 2D (caméra fixe et pages à plat)') => '1',
                                                                            __("Laisser le choix à l'utilisateur (mode 3D par défaut)") => '2',
                                                                            __("Laisser le choix à l'utilisateur (mode 2D par défaut)") => '3'));
-               $this->fields['viewMode'] = array('type' => 'combo', 'default' => '3', 'editable' => true, 'label' => __("Mode de visualisation (beta)"),
+               $this->fields['viewMode'] = array('type' => 'combo', 'default' => '0', 'editable' => true, 'label' => __("Mode de visualisation (beta)"),
                                                  'datas' => array(__('Classique') => '0',
                                                                   __("Diaporama") => '1'), 'grade' => 5);
                $this->fields['antialiasReading'] = array('type' => 'boolean', 'default' => true, 'editable' => true, 'label' => __("Amélioration de la lisibilité en mode 2D"));
@@ -321,7 +321,7 @@ class wsBookParametres extends wsParametres {
 
                $this->fields['navOrderH'] = array('type' => 'textarea', 'default' => '', 'editable' => true, 'label' => __('Ordre des icônes dans la nav') . ' (' . __('Si différente') . ')', 'grade' => 3);
 
-               $this->fields['mobileLVersion'] = array('type' => 'combo', 'default' => 'stable', 'editable' => true, 'label' => __('Version logicielle'), 'grade' => 5,
+               $this->fields['mobileLVersion'] = array('type' => 'combo', 'default' => 'stable', 'editable' => true, 'label' => __('Version logicielle'), 'grade' =>1,
                                                        'datas' => array(__('Stable') => 'stable',
                                                                         __('En cours de développement') => 'dev')
                );

diff --git a/inc/ws/Metier/class.ws.parametres.php b/inc/ws/Metier/class.ws.parametres.php
index 9ac085d1c3038156cdb0544f4bace4a57ab8fde7..13436960fa22b2b06fa5076cd43de66f83b2a089 100644 (file)
--- a/inc/ws/Metier/class.ws.parametres.php
+++ b/inc/ws/Metier/class.ws.parametres.php
@@ -12,6 +12,7 @@ class wsParametres extends cubeMetier implements Iterator {
                $this->parent = $parent;\r
                $this->initFields();\r
                $this->datas = array();\r
+               $this->setDefaultValues();\r
        }\r
 \r
        public function isEmpty() {\r
@@ -76,6 +77,14 @@ class wsParametres extends cubeMetier implements Iterator {
                $this->forms = array();\r
        }\r
 \r
+       protected function setDefaultValues() {\r
+               foreach ($this->fields as $k => $f) {\r
+                       if (isset($f["default"])) {\r
+                               $this->set($k, $f['default']);\r
+                       }\r
+               }\r
+       }\r
+\r
        protected function set($varname, $value) {\r
                if (!$this->_isset($varname)) {\r
                        throw new Exception('You are setting an attribute (' . get_class($this) . '::' . $varname . ') which not exists');\r
@@ -107,10 +116,8 @@ class wsParametres extends cubeMetier implements Iterator {
                                $value = cubeMath::fill(ltrim($value, '#'), 6);\r
                                break;\r
                        case 'couleurAlpha':\r
-                               fb($value);\r
                                $value = cubeMath::fill(ltrim($value, '#'), 6);\r
-                               $value = cubeMath::fill($value,8,'f');\r
-                               fb($value);\r
+                               $value = cubeMath::fill($value, 8, 'f');\r
                                break;\r
                        case 'date':\r
                                if (!is_int($value)) {\r
@@ -122,7 +129,7 @@ class wsParametres extends cubeMetier implements Iterator {
                                $value = array_pop($e);\r
                                break;\r
                        default:\r
-                               $value = (string) $value;\r
+                               $value = (string)$value;\r
                                break;\r
                } // switch\r
                $this->datas[$varname] = $value;\r