(no commit message)

diff --git a/images/ws/btdel.png b/images/ws/btdel.png
new file mode 100644 (file)
index 0000000..039b064
Binary files /dev/null and b/images/ws/btdel.png differ

diff --git a/images/ws/btdownload.png b/images/ws/btdownload.png
new file mode 100644 (file)
index 0000000..dd9d8f6
Binary files /dev/null and b/images/ws/btdownload.png differ

diff --git a/images/ws/btedit.png b/images/ws/btedit.png
new file mode 100644 (file)
index 0000000..e2ecd20
Binary files /dev/null and b/images/ws/btedit.png differ

diff --git a/images/ws/btstats.png b/images/ws/btstats.png
new file mode 100644 (file)
index 0000000..7f305d9
Binary files /dev/null and b/images/ws/btstats.png differ

diff --git a/images/ws/btview.png b/images/ws/btview.png
new file mode 100644 (file)
index 0000000..f8fd39d
Binary files /dev/null and b/images/ws/btview.png differ

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index ca254e516161a871ed8453d2e64d6bc19ce07f63..98cbb8ef723914cc9da651a25ff3364374eee2d0 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -88,12 +88,14 @@ class wsUrl {
                $res .= '</tr>';\r
                $i = 0;\r
 \r
-               $btVoir = cubeMedia::cssRollover($core->typo->Voir(__('voir'), '', false));\r
-               $btEdit = cubeMedia::cssRollover($core->typo->Editer(__('éditer'), '', false));\r
-               $btStats = cubeMedia::cssRollover($core->typo->Stats(__('stats'), '', false));\r
-               $btDownload = cubeMedia::cssRollover($core->typo->BookTelecharger(__('télécharger'), '', false));\r
+\r
+\r
+               $btVoir = '<div></div><span>'.__('voir').'</span>';\r
+               $btEdit = '<div></div><span>'.__('éditer').'</span>';\r
+               $btStats = '<div></div><span>'.__('stats').'</span>';\r
+               $btDownload = '<div></div><span>'.__('télécharger').'</span>';\r
                if ($droits->creation) {\r
-                       $btDel = cubeMedia::cssRollover($core->typo->Supprimer(__('suppr.'), '', false));\r
+                       $btDel = '<div></div><span>'.__('suppr.').'</span>';\r
                }\r
 \r
                foreach ($liste as $id => $book) {\r
@@ -133,30 +135,30 @@ class wsUrl {
                        }\r
                        if ($book->version > 1 || $droits->admin) {\r
                                if ($droits->admin) {\r
-                                       $res .= '<td class="bouton"><a href="/viewer/' . $book->book_id . '_' . $book->hash . '/" class="openContextMenu" rel="' . $context_view_id . '" rev="' . $book->book_id . '§' . $book->hash . '§' . TIME . '">' . $btVoir . '</a></td>';\r
+                                       $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>';\r
                                } else {\r
                                        $viewURL = SITE_PATH . 'viewer/' . $book->book_id . '_' . $book->hash;\r
                                        if ($book->parametres->version == 1) {\r
                                                $viewURL = SITE_PATH . 'viewer1/' . $book->book_id . '_' . $book->hash;\r
                                        }\r
-                                       $res .= '<td class="bouton"><a class="popupFSBar" rel="toolbar=yes" rev="viewer_' . $book->book_id . '" href="' . $viewURL . '/">' . $btVoir . '</a></td>';\r
+                                       $res .= '<td class="bouton"><a class="popupFSBar voir btbook" rel="toolbar=yes" rev="viewer_' . $book->book_id . '" href="' . $viewURL . '/">' . $btVoir . '</a></td>';\r
                                }\r
-                               $res .= '<td class="bouton"><a class="popupFSBar" rel="toolbar=yes" rev="editor_' . $book->book_id . '" href="' . SITE_PATH . 'editor/' . $book->book_id . '_' . $book->hash . '">' . $btEdit . '</a></td>';\r
+                               $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>';\r
                        } else {\r
                                $res.='<td></td><td></td>';\r
                        }\r
-                       $res .= '<td class="bouton"><a href="' . SITE_PATH . 'stats/' . $book->book_id . '_' . $book->hash . '" class="normallink">' . $btStats . '</a></td>';\r
+                       $res .= '<td class="bouton"><a href="' . SITE_PATH . 'stats/' . $book->book_id . '_' . $book->hash . '" class="normallink stats btbook">' . $btStats . '</a></td>';\r
                        if ($book->version > 1) {\r
                                if ($droits->admin) {\r
-                                       $res .= '<td class="bouton"><a href="#" rel="exportbook/' . $book->book_id . '" class="popup">' . $btDownload . '</a></td>';\r
+                                       $res .= '<td class="bouton"><a href="#" rel="exportbook/' . $book->book_id . '" class="popup download btbook">' . $btDownload . '</a></td>';\r
                                } else {\r
-                                       $res .= '<td class="bouton"><a href="#" class="openContextMenu" rel="' . $context_download_id . '" rev="' . $book->book_id . '">' . $btDownload . '</a></td>';\r
+                                       $res .= '<td class="bouton"><a href="#" class="openContextMenuv download btbook" rel="' . $context_download_id . '" rev="' . $book->book_id . '">' . $btDownload . '</a></td>';\r
                                }\r
                        } else {\r
                                $res.='<td></td>';\r
                        }\r
                        if ($droits->creation && $book->status < 0) {\r
-                               $res .= '<td class="bouton"><a href="#" rel="supprimeBook/' . $book->book_id . '" class="ajax" title="' . __('Êtes-vous certain de vouloir supprimer cette publication ?') . '">' . $btDel . '</a></td>';\r
+                               $res .= '<td class="bouton"><a href="#" rel="supprimeBook/' . $book->book_id . '" class="ajax suppr btbook" title="' . __('Êtes-vous certain de vouloir supprimer cette publication ?') . '">' . $btDel . '</a></td>';\r
                        } else {\r
                                $res.='<td></td>';\r
                        }\r

diff --git a/style/ws/style.css b/style/ws/style.css
index 335b02736d80e53ca1a9443b9e1037c7e7776288..191ea41132b35b468c89827d30f0ed437ef4061b 100644 (file)
--- a/style/ws/style.css
+++ b/style/ws/style.css
@@ -34,7 +34,7 @@ input[type="text"],input[type="password"],input[type="email"],input[type="search
 .closePopup img{margin-top:4px;}\r
 \r
 .login h1{\r
-        padding: 10px 10px 5px;\r
+       padding: 10px 10px 5px;\r
 }\r
 \r
 .content{\r
@@ -508,4 +508,71 @@ th.stats_col{
 \r
 #restoreLinks h2{\r
        margin:5px 0 10px 0;\r
+}\r
+\r
+.liste .bouton a.btbook{\r
+       display:inline-block;\r
+       height:16px;\r
+       padding:2px 6px 2px 2px;\r
+       border:1px solid #fff;\r
+       border-radius:5px;\r
+       background-color: rgb(251,251,251);\r
+       background-image: url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSI2OCUiIHN0b3AtY29sb3I9IiNmYmZiZmIiIHN0b3Atb3BhY2l0eT0iMSIvPgogICAgPHN0b3Agb2Zmc2V0PSIxMDAlIiBzdG9wLWNvbG9yPSIjZTVlNmU2IiBzdG9wLW9wYWNpdHk9IjEiLz4KICA8L2xpbmVhckdyYWRpZW50PgogIDxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZ3JhZC11Y2dnLWdlbmVyYXRlZCkiIC8+Cjwvc3ZnPg==");\r
+       background-image: -moz-linear-gradient(top, rgba(251,251,251,1) 68%, rgba(229,230,230,1) 100%);\r
+       background-image: -webkit-gradient(linear, left top, left bottom, color-stop(68%,rgba(251,251,251,1)), color-stop(100%,rgba(229,230,230,1)));\r
+       background-image: -webkit-linear-gradient(top, rgba(251,251,251,1) 68%,rgba(229,230,230,1) 100%);\r
+       background-image: -o-linear-gradient(top, rgba(251,251,251,1) 68%,rgba(229,230,230,1) 100%);\r
+       background-image: -ms-linear-gradient(top, rgba(251,251,251,1) 68%,rgba(229,230,230,1) 100%);\r
+       background-image: linear-gradient(to bottom, rgba(251,251,251,1) 68%,rgba(229,230,230,1) 100%);\r
+       line-height: 16px;\r
+       font-size:13px;\r
+       color:#b1b5a0;\r
+       font-family: UniversCondensedBold;\r
+       text-decoration: none;\r
+       text-transform: uppercase;\r
+        white-space: nowrap;\r
+\r
+\r
+       -moz-box-shadow: 0px 0px 2px rgba(0,0,0,0.25);\r
+       -webkit-box-shadow: 0px 0px 2px rgba(0,0,0,0.25);\r
+       -ms-box-shadow: 0px 0px 2px rgba(0,0,0,0.25);\r
+       -o-box-shadow: 0px 0px 2px rgba(0,0,0,0.25);\r
+       box-shadow: 0px 0px 2px rgba(0,0,0,0.25);\r
+}\r
+\r
+.liste .bouton a.btbook>div{\r
+       display:inline-block;\r
+       width:16px;\r
+       height:16px;\r
+       background-position: 0 0;\r
+}\r
+\r
+.liste .bouton a.btbook>span{\r
+       display:inline-block;\r
+       vertical-align: top;\r
+       margin:0 0 0 5px;\r
+}\r
+\r
+.liste .bouton a.btbook:hover>div{\r
+       background-position: 0 100%;\r
+}\r
+\r
+.liste .bouton a.btbook.suppr>div{\r
+       background-image: url("../../images/ws/btdel.png");\r
+}\r
+\r
+.liste .bouton a.btbook.voir>div{\r
+       background-image: url("../../images/ws/btview.png");\r
+}\r
+\r
+.liste .bouton a.btbook.download>div{\r
+       background-image: url("../../images/ws/btdownload.png");\r
+}\r
+\r
+.liste .bouton a.btbook.stats>div{\r
+       background-image: url("../../images/ws/btstats.png");\r
+}\r
+\r
+.liste .bouton a.btbook.edit>div{\r
+       background-image: url("../../images/ws/btedit.png");\r
 }
\ No newline at end of file

diff --git a/typo/ws/desc.xml b/typo/ws/desc.xml
index b26bf8f0bfbd862a8fb87454b06cc164f0af33ee..b70429222ccdf2fd31813f245ca0826d29eb8219 100644 (file)
--- a/typo/ws/desc.xml
+++ b/typo/ws/desc.xml
@@ -1,44 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <theme>\r
        <name>CubeExtranet</name>\r
-       <template>\r
-               <name>Onglet</name>\r
-               <width>auto</width>\r
-               <height>auto</height>\r
-               <layer>\r
-                       <name>fond</name>\r
-                       <type>image</type>\r
-                       <file>onglet.png</file>\r
-                       <top>0</top>\r
-                       <left>0</left>\r
-                       <repeat>no-repeat</repeat>\r
-                       <dim>1</dim>\r
-               </layer>\r
-               <layer>\r
-                       <name>texte</name>\r
-                       <type>font</type>\r
-                       <font_family>Univers-CondensedBold.ttf</font_family>\r
-                       <font_size>10</font_size>\r
-                       <color>ffffff</color>\r
-                       <top>8</top>\r
-                       <left>auto</left>\r
-                       <bottom>0</bottom>\r
-                       <texte>$texte</texte>\r
-                       <upper>1</upper>\r
-               </layer>\r
-               <layer>\r
-                       <name>texte1</name>\r
-                       <type>font</type>\r
-                       <font_family>Univers-CondensedBold.ttf</font_family>\r
-                       <font_size>10</font_size>\r
-                       <color>8a8e78</color>\r
-                       <top>41</top>\r
-                       <left>auto</left>\r
-                       <bottom>0</bottom>\r
-                       <texte>$texte</texte>\r
-                       <upper>1</upper>\r
-               </layer>\r
-       </template>\r
        <template>\r
                <name>Ajouter</name>\r
                <width>auto</width>\r
@@ -123,281 +85,6 @@
                        <texte>$texte</texte>\r
                </layer>\r
        </template>\r
-       <template>\r
-               <name>Editer</name>\r
-               <width>auto</width>\r
-               <height>54</height>\r
-               <layer>\r
-                       <name>gauche</name>\r
-                       <type>image</type>\r
-                       <file>edit-left.png</file>\r
-                       <top>0</top>\r
-                       <left>0</left>\r
-                       <repeat>no-repeat</repeat>\r
-               </layer>\r
-               <layer>\r
-                       <name>centre</name>\r
-                       <type>image</type>\r
-                       <file>ws-middle.png</file>\r
-                       <top>0</top>\r
-                       <left>24</left>\r
-                       <repeat>repeat-x</repeat>\r
-                       <width>-7</width>\r
-               </layer>\r
-               <layer>\r
-                       <name>droit</name>\r
-                       <type>image</type>\r
-                       <file>ws-right.png</file>\r
-                       <top>0</top>\r
-                       <right>0</right>\r
-                       <repeat>no-repeat</repeat>\r
-               </layer>\r
-               <layer>\r
-                       <name>texte</name>\r
-                       <type>font</type>\r
-                       <upper>1</upper>\r
-                       <font_family>Univers-CondensedBold.ttf</font_family>\r
-                       <font_size>8.5</font_size>\r
-                       <color>989b85</color>\r
-                       <top>6</top>\r
-                       <left>24</left>\r
-                       <right>7</right>\r
-                       <dim>1</dim>\r
-                       <texte>$texte</texte>\r
-               </layer>\r
-               <layer>\r
-                       <name>texte1</name>\r
-                       <type>font</type>\r
-                       <upper>1</upper>\r
-                       <font_family>Univers-CondensedBold.ttf</font_family>\r
-                       <font_size>8.5</font_size>\r
-                       <color>989b85</color>\r
-                       <top>34</top>\r
-                       <left>24</left>\r
-                       <right>7</right>\r
-                       <texte>$texte</texte>\r
-               </layer>\r
-       </template>\r
-       <template>\r
-               <name>Voir</name>\r
-               <width>auto</width>\r
-               <height>54</height>\r
-               <layer>\r
-                       <name>gauche</name>\r
-                       <type>image</type>\r
-                       <file>see-left.png</file>\r
-                       <top>0</top>\r
-                       <left>0</left>\r
-                       <repeat>no-repeat</repeat>\r
-               </layer>\r
-               <layer>\r
-                       <name>centre</name>\r
-                       <type>image</type>\r
-                       <file>ws-middle.png</file>\r
-                       <top>0</top>\r
-                       <left>24</left>\r
-                       <repeat>repeat-x</repeat>\r
-                       <width>-7</width>\r
-               </layer>\r
-               <layer>\r
-                       <name>droit</name>\r
-                       <type>image</type>\r
-                       <file>ws-right.png</file>\r
-                       <top>0</top>\r
-                       <right>0</right>\r
-                       <repeat>no-repeat</repeat>\r
-               </layer>\r
-               <layer>\r
-                       <name>texte</name>\r
-                       <type>font</type>\r
-                       <upper>1</upper>\r
-                       <font_family>Univers-CondensedBold.ttf</font_family>\r
-                       <font_size>8.5</font_size>\r
-                       <color>989b85</color>\r
-                       <top>6</top>\r
-                       <left>24</left>\r
-                       <right>7</right>\r
-                       <dim>1</dim>\r
-                       <texte>$texte</texte>\r
-               </layer>\r
-               <layer>\r
-                       <name>texte1</name>\r
-                       <type>font</type>\r
-                       <upper>1</upper>\r
-                       <font_family>Univers-CondensedBold.ttf</font_family>\r
-                       <font_size>8.5</font_size>\r
-                       <color>989b85</color>\r
-                       <top>34</top>\r
-                       <left>24</left>\r
-                       <right>7</right>\r
-                       <texte>$texte</texte>\r
-               </layer>\r
-       </template>\r
-       <template>\r
-               <name>BookTelecharger</name>\r
-               <width>auto</width>\r
-               <height>54</height>\r
-               <layer>\r
-                       <name>gauche</name>\r
-                       <type>image</type>\r
-                       <file>download-left.png</file>\r
-                       <top>0</top>\r
-                       <left>0</left>\r
-                       <repeat>no-repeat</repeat>\r
-               </layer>\r
-               <layer>\r
-                       <name>centre</name>\r
-                       <type>image</type>\r
-                       <file>ws-middle.png</file>\r
-                       <top>0</top>\r
-                       <left>24</left>\r
-                       <repeat>repeat-x</repeat>\r
-                       <width>-7</width>\r
-               </layer>\r
-               <layer>\r
-                       <name>droit</name>\r
-                       <type>image</type>\r
-                       <file>ws-right.png</file>\r
-                       <top>0</top>\r
-                       <right>0</right>\r
-                       <repeat>no-repeat</repeat>\r
-               </layer>\r
-               <layer>\r
-                       <name>texte</name>\r
-                       <type>font</type>\r
-                       <upper>1</upper>\r
-                       <font_family>Univers-CondensedBold.ttf</font_family>\r
-                       <font_size>8.5</font_size>\r
-                       <color>989b85</color>\r
-                       <top>6</top>\r
-                       <left>24</left>\r
-                       <right>7</right>\r
-                       <dim>1</dim>\r
-                       <texte>$texte</texte>\r
-               </layer>\r
-               <layer>\r
-                       <name>texte1</name>\r
-                       <type>font</type>\r
-                       <upper>1</upper>\r
-                       <font_family>Univers-CondensedBold.ttf</font_family>\r
-                       <font_size>8.5</font_size>\r
-                       <color>989b85</color>\r
-                       <top>34</top>\r
-                       <left>24</left>\r
-                       <right>7</right>\r
-                       <texte>$texte</texte>\r
-               </layer>\r
-       </template>\r
-       <template>\r
-               <name>Supprimer</name>\r
-               <width>auto</width>\r
-               <height>54</height>\r
-               <layer>\r
-                       <name>gauche</name>\r
-                       <type>image</type>\r
-                       <file>delete-left.png</file>\r
-                       <top>0</top>\r
-                       <left>0</left>\r
-                       <repeat>no-repeat</repeat>\r
-               </layer>\r
-               <layer>\r
-                       <name>centre</name>\r
-                       <type>image</type>\r
-                       <file>ws-middle.png</file>\r
-                       <top>0</top>\r
-                       <left>24</left>\r
-                       <repeat>repeat-x</repeat>\r
-                       <width>-7</width>\r
-               </layer>\r
-               <layer>\r
-                       <name>droit</name>\r
-                       <type>image</type>\r
-                       <file>ws-right.png</file>\r
-                       <top>0</top>\r
-                       <right>0</right>\r
-                       <repeat>no-repeat</repeat>\r
-               </layer>\r
-               <layer>\r
-                       <name>texte</name>\r
-                       <type>font</type>\r
-                       <upper>1</upper>\r
-                       <font_family>Univers-CondensedBold.ttf</font_family>\r
-                       <font_size>8.5</font_size>\r
-                       <color>989b85</color>\r
-                       <top>6</top>\r
-                       <left>24</left>\r
-                       <right>7</right>\r
-                       <dim>1</dim>\r
-                       <texte>$texte</texte>\r
-               </layer>\r
-               <layer>\r
-                       <name>texte1</name>\r
-                       <type>font</type>\r
-                       <upper>1</upper>\r
-                       <font_family>Univers-CondensedBold.ttf</font_family>\r
-                       <font_size>8.5</font_size>\r
-                       <color>989b85</color>\r
-                       <top>34</top>\r
-                       <left>24</left>\r
-                       <right>7</right>\r
-                       <texte>$texte</texte>\r
-               </layer>\r
-       </template>\r
-       <template>\r
-               <name>Stats</name>\r
-               <width>auto</width>\r
-               <height>54</height>\r
-               <layer>\r
-                       <name>gauche</name>\r
-                       <type>image</type>\r
-                       <file>stats-left.png</file>\r
-                       <top>0</top>\r
-                       <left>0</left>\r
-                       <repeat>no-repeat</repeat>\r
-               </layer>\r
-               <layer>\r
-                       <name>centre</name>\r
-                       <type>image</type>\r
-                       <file>ws-middle.png</file>\r
-                       <top>0</top>\r
-                       <left>24</left>\r
-                       <repeat>repeat-x</repeat>\r
-                       <width>-7</width>\r
-               </layer>\r
-               <layer>\r
-                       <name>droit</name>\r
-                       <type>image</type>\r
-                       <file>ws-right.png</file>\r
-                       <top>0</top>\r
-                       <right>0</right>\r
-                       <repeat>no-repeat</repeat>\r
-               </layer>\r
-               <layer>\r
-                       <name>texte</name>\r
-                       <type>font</type>\r
-                       <upper>1</upper>\r
-                       <font_family>Univers-CondensedBold.ttf</font_family>\r
-                       <font_size>8.5</font_size>\r
-                       <color>989b85</color>\r
-                       <top>6</top>\r
-                       <left>24</left>\r
-                       <right>7</right>\r
-                       <dim>1</dim>\r
-                       <texte>$texte</texte>\r
-               </layer>\r
-               <layer>\r
-                       <name>texte1</name>\r
-                       <type>font</type>\r
-                       <upper>1</upper>\r
-                       <font_family>Univers-CondensedBold.ttf</font_family>\r
-                       <font_size>8.5</font_size>\r
-                       <color>989b85</color>\r
-                       <top>34</top>\r
-                       <left>24</left>\r
-                       <right>7</right>\r
-                       <texte>$texte</texte>\r
-               </layer>\r
-       </template>\r
        <template>\r
                <name>OngletBlanc</name>\r
                <width>auto</width>\r
@@ -484,24 +171,6 @@
                        <upper>1</upper>\r
                </layer>\r
        </template>\r
-       <template>\r
-               <name>Titre</name>\r
-               <width>auto</width>\r
-               <height>auto</height>\r
-               <layer>\r
-                       <name>texte</name>\r
-                       <type>font</type>\r
-                       <font_family>Univers-CondensedBold.ttf</font_family>\r
-                       <font_size>13</font_size>\r
-                       <color>989b85</color>\r
-                       <top>0</top>\r
-                       <left>0</left>\r
-                       <right>2</right>\r
-                       <bottom>0</bottom>\r
-                       <texte>$texte</texte>\r
-                       <dim>1</dim>\r
-               </layer>\r
-       </template>\r
        <template>\r
                <name>Contact</name>\r
                <width>auto</width>\r