various minor style updates, add danger buttons

diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php
index 530d851d7812bb28621e0805bb9d61d0c600549c..a29b2accab59c36c301a935301cc6cf00cefc486 100644 (file)
--- a/classes/pref/feeds.php
+++ b/classes/pref/feeds.php
@@ -779,7 +779,7 @@ class Pref_Feeds extends Handler_Protected {
 
                print "<div class='dlgButtons'>
                        <div style=\"float : left\">
-                       <button dojoType=\"dijit.form.Button\" onclick='return unsubscribeFeed($feed_id, \"$title\")'>".
+                       <button class=\"danger\" dojoType=\"dijit.form.Button\" onclick='return unsubscribeFeed($feed_id, \"$title\")'>".
                                __('Unsubscribe')."</button>";
 
                if (PUBSUBHUBBUB_ENABLED) {
@@ -1443,7 +1443,8 @@ class Pref_Feeds extends Handler_Protected {
 
                print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('OPML')."\">";
 
-               print_notice(__("Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings.") . __("Only main settings profile can be migrated using OPML."));
+               print "<p>" . __("Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings.") .
+                       __("Only main settings profile can be migrated using OPML.") . "</p>";
 
                print "<iframe id=\"upload_iframe\"
                        name=\"upload_iframe\" onload=\"opmlImportComplete(this)\"
@@ -1470,9 +1471,9 @@ class Pref_Feeds extends Handler_Protected {
 
                print "<hr>";
 
-               print "<p>".__('Your OPML can be published publicly and can be subscribed by anyone who knows the URL below.') . " ";
+               print "<p>" . __('Your OPML can be published publicly and can be subscribed by anyone who knows the URL below.') . "</p>";
 
-               print __("Published OPML does not include your Tiny Tiny RSS settings, feeds that require authentication or feeds hidden from Popular feeds.") . "</p>";
+               print_warning("Published OPML does not include your Tiny Tiny RSS settings, feeds that require authentication or feeds hidden from Popular feeds.");
 
                print "<button dojoType=\"dijit.form.Button\" onclick=\"return displayDlg('".__("Public OPML URL")."','pubOPMLUrl')\">".
                        __('Display published OPML URL')."</button> ";
@@ -1503,7 +1504,7 @@ class Pref_Feeds extends Handler_Protected {
 
                print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Published & shared articles / Generated feeds')."\">";
 
-               print_notice(__('Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below.'));
+               print "<p>" . __('Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below.') . "</p>";
 
                $rss_url = '-2::' . htmlspecialchars(get_self_url_prefix() .
                                "/public.php?op=rss&id=-2&view-mode=all_articles");;
@@ -1513,7 +1514,7 @@ class Pref_Feeds extends Handler_Protected {
                print "<button dojoType=\"dijit.form.Button\" onclick=\"return displayDlg('".__("View as RSS")."','generatedFeed', '$rss_url')\">".
                        __('Display URL')."</button> ";
 
-               print "<button dojoType=\"dijit.form.Button\" onclick=\"return clearFeedAccessKeys()\">".
+               print "<button class=\"warning\" dojoType=\"dijit.form.Button\" onclick=\"return clearFeedAccessKeys()\">".
                        __('Clear all generated URLs')."</button> ";
 
                print "</p>";
@@ -1643,7 +1644,7 @@ class Pref_Feeds extends Handler_Protected {
 
                print "<div class='dlgButtons'>";
                print "<div style='float : left'>";
-               print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('inactiveFeedsDlg').removeSelected()\">"
+               print "<button class=\"danger\" dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('inactiveFeedsDlg').removeSelected()\">"
                        .__('Unsubscribe from selected feeds')."</button> ";
                print "</div>";
 
@@ -1709,7 +1710,7 @@ class Pref_Feeds extends Handler_Protected {
 
                print "<div class='dlgButtons'>";
                print "<div style='float : left'>";
-               print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('errorFeedsDlg').removeSelected()\">"
+               print "<button class=\"danger\" dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('errorFeedsDlg').removeSelected()\">"
                        .__('Unsubscribe from selected feeds')."</button> ";
                print "</div>";
 

diff --git a/css/dijit.css b/css/dijit.css
index f3fbc686e89b74856459ec3d145b2dcb972f75b3..06c2bffd2525ee711c9b790ec1547598455c6ab5 100644 (file)
--- a/css/dijit.css
+++ b/css/dijit.css
@@ -184,6 +184,39 @@
 
 /* Various buttons */
 
+.claro .dijitButton.danger .dijitButtonText {
+       color: #ffffff;
+}
+
+.claro .dijitButton.danger {
+       text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+       background-color: #da4f49;
+       *background-color: #bd362f;
+       background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f);
+       background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f));
+       background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f);
+       background-image: -o-linear-gradient(top, #ee5f5b, #bd362f);
+       background-image: linear-gradient(to bottom, #ee5f5b, #bd362f);
+       background-repeat: repeat-x;
+       border-color: #bd362f #bd362f #802420;
+       border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+       filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffbd362f', GradientType=0);
+       filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+}
+
+.claro .dijitButton.dijitButtonDisabled.danger,
+.claro .dijitButton.dijitButtonActive.danger,
+.claro .dijitButton.dijitButtonHover.danger,
+.claro .dijitButton.dijitFocused.danger {
+       color: #ffffff;
+       background-color: #bd362f;
+       *background-color: #a9302a;
+}
+
+.claro .dijitButton.dijitButtonActive.danger {
+       background-color: #942a25 \9;
+}
+
 .claro .dijitDropDownButton {
        margin : 0px;
 }
@@ -192,6 +225,10 @@
        padding : 0px;
 }
 
+.claro .dijitButton.dijitButtonActive.danger {
+       color: rgba(255, 255, 255, 0.75);
+}
+
 .claro .dijitButton .dijitButtonNode,
 .claro .dijitDropDownButton .dijitButtonNode,
 .claro .dijitComboButton .dijitButtonNode, 
@@ -628,3 +665,5 @@ button[disabled],
 .claro .dijitProgressBar .dijitProgressBarLabel {
        color : white;
 }
+
+

diff --git a/plugins/af_psql_trgm/init.php b/plugins/af_psql_trgm/init.php
index d89c122f68a573aafac68331137843c65bda82cc..f93f7c02b51614ddd944746c1621d9984c680015 100644 (file)
--- a/plugins/af_psql_trgm/init.php
+++ b/plugins/af_psql_trgm/init.php
@@ -156,7 +156,7 @@ class Af_Psql_Trgm extends Plugin {
                print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"method\" value=\"save\">";
                print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"plugin\" value=\"af_psql_trgm\">";
 
-               print_notice("PostgreSQL trigram extension returns string similarity as a floating point number (0-1). Setting it too low might produce false positives, zero disables checking.");
+               print "<p>" . __("PostgreSQL trigram extension returns string similarity as a floating point number (0-1). Setting it too low might produce false positives, zero disables checking.") . "</p>";
                print_notice("Enable the plugin for specific feeds in the feed editor.");
 
                print "<h3>" . __("Global settings") . "</h3>";

diff --git a/plugins/af_redditimgur/init.php b/plugins/af_redditimgur/init.php
index e7658120d4f04675a52358b04aae138f3d63e2ad..9b3a999d30d864da7eea775ea9d3b980a12c9cc6 100644 (file)
--- a/plugins/af_redditimgur/init.php
+++ b/plugins/af_redditimgur/init.php
@@ -43,9 +43,7 @@ class Af_RedditImgur extends Plugin {
                print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"method\" value=\"save\">";
                print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"plugin\" value=\"af_redditimgur\">";
 
-               print "<h3>" . __("Global settings") . "</h3>";
-
-               print_notice("Uses Readability (full-text-rss) implementation by <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>");
+               print "<p>" . __("Uses Readability (full-text-rss) implementation by <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>");
                print "<p/>";
 
                print "<input dojoType=\"dijit.form.CheckBox\" id=\"enable_readability\"

diff --git a/plugins/bookmarklets/init.php b/plugins/bookmarklets/init.php
index 4c4d95d498973647203bd4ec647463018ceddbb3..a230b2854555c97947224e4ca48d9c7eef93d970 100644 (file)
--- a/plugins/bookmarklets/init.php
+++ b/plugins/bookmarklets/init.php
@@ -19,7 +19,7 @@ class Bookmarklets extends Plugin {
 
                print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Bookmarklets')."\">";
 
-               print_notice(__("Drag the link below to your browser toolbar, open the feed you're interested in in your browser and click on the link to subscribe to it."));
+               print "<p>" . __("Drag the link below to your browser toolbar, open the feed you're interested in in your browser and click on the link to subscribe to it.") . "</p>";
 
                $bm_subscribe_url = str_replace('%s', '', add_feed_url());
 
@@ -31,7 +31,7 @@ class Bookmarklets extends Plugin {
                print "<a href=\"$bm_url\" class='bookmarklet'>" . __('Subscribe in Tiny Tiny RSS'). "</a>";
                print "</p>";
 
-               print_notice(__("Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"));
+               print "<p>" . __("Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS") . "</p>";
 
                print "<p>";
 

diff --git a/plugins/share/init.php b/plugins/share/init.php
index bcc081897adde79b43dc29840935f096e21bf5ab..0f8f8fec12633165d68d612f5e9fa97cc04c8161 100644 (file)
--- a/plugins/share/init.php
+++ b/plugins/share/init.php
@@ -36,11 +36,9 @@ class Share extends Plugin {
        function hook_prefs_tab_section($id) {
                if ($id == "prefFeedsPublishedGenerated") {
 
-                       print_warning(__("You can disable all articles shared by unique URLs here."));
+                       print "<p>" . __("You can disable all articles shared by unique URLs here.") . "</p>";
 
-                       print "<p>";
-
-                       print "<button dojoType=\"dijit.form.Button\" onclick=\"return clearArticleAccessKeys()\">".
+                       print "<button class=\"danger\" dojoType=\"dijit.form.Button\" onclick=\"return clearArticleAccessKeys()\">".
                                __('Unshare all articles')."</button> ";
 
                        print "</p>";
@@ -96,7 +94,7 @@ class Share extends Plugin {
                                        AND owner_uid = " . $_SESSION['uid']);
                        }
 
-                       print "<h2>". __("You can share this article by the following unique URL:") . "</h2>";
+                       print __("You can share this article by the following unique URL:") . "<br/>";
 
                        $url_path = get_self_url_prefix();
                        $url_path .= "/public.php?op=share&key=$uuid";