ui: use dijit.Toolbar

diff --git a/tt-rss.css b/tt-rss.css
index a9897b80a3c7deba260888027061d60c8158f799..40ea6809981a26f10fd7d87dd7ec4d158338b66f 100644 (file)
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -929,7 +929,7 @@ html, body#ttrssPrefs, #main {
 #toolbar div.actionChooser {
        display : table-cell;
        text-align : right;
-       padding-right : 5px;
+       padding-right : 3px;
 }
 
 /* preferences layout */
@@ -1478,7 +1478,7 @@ div.fatalError textarea {
 }
 
 #toolbar {
-       padding : 5px 0px 0px 5px;
+       padding : 0px;
        margin : 0px;
        border-width : 0px;
        white-space: nowrap;

diff --git a/tt-rss.js b/tt-rss.js
index f408197d2a478e827db5b1261e4712cdb32fc8ce..47ccf415437e84ed9f06d10f0cb88d9559d3def5 100644 (file)
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -280,6 +280,7 @@ function init() {
                dojo.require("dojo.data.ItemFileWriteStore");
                dojo.require("dijit.Tree");
                dojo.require("dijit.form.Select");
+               dojo.require("dijit.Toolbar");
                dojo.require("dojo.parser");
 
                if (typeof themeBeforeLayout == 'function') {

diff --git a/tt-rss.php b/tt-rss.php
index b1f43506fdbf9ba1cc5a7ae3f569589525dfcec4..286ebf9d970812c284268e53f4380ae08fdbb1a9 100644 (file)
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -129,6 +129,8 @@
 
 <div id="toolbar" dojoType="dijit.layout.ContentPane" region="top">
 
+       <div id="main-toolbar" dojoType="dijit.Toolbar">                
+
                <form id="main_toolbar_form" action="" onsubmit='return false'>
 
                <button id="collapse_feeds_btn" onclick="collapse_feedlist()"
@@ -188,6 +190,8 @@
                        </select>
                </div>
 
+               </div>
+
        </div>
 
        <div id="headlines-wrap-inner" dojoType="dijit.layout.BorderContainer" region="center">