blallo/tt-rss
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

add some primary dialog actions; update css

Browse source
This commit is contained in:
Andrew Dolgov 2017-12-11 18:36:36 +03:00
parent 5f7be9957f
commit 6fb5ce5e35
7 changed files with 62 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
classes/feeds.php
View file

@ -1161,7 +1161,7 @@ class Feeds extends Handler_Protected {
</div>"; </div>";
} }
print "<button dojoType=\"dijit.form.Button\" type=\"submit\" class=\"primary\" onclick=\"dijit.byId('searchDlg').execute()\">".__('Search')."</button> print "<button dojoType=\"dijit.form.Button\" type=\"submit\" class=\"btn-primary\" onclick=\"dijit.byId('searchDlg').execute()\">".__('Search')."</button>
<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('searchDlg').hide()\">".__('Cancel')."</button> <button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('searchDlg').hide()\">".__('Cancel')."</button>
</div>"; </div>";

8
classes/pref/feeds.php
View file

@ -742,7 +742,7 @@ class Pref_Feeds extends Handler_Protected {
<input type=\"hidden\" name=\"method\" value=\"uploadicon\"> <input type=\"hidden\" name=\"method\" value=\"uploadicon\">
<button class=\"\" dojoType=\"dijit.form.Button\" onclick=\"return uploadFeedIcon();\" <button class=\"\" dojoType=\"dijit.form.Button\" onclick=\"return uploadFeedIcon();\"
type=\"submit\">".__('Replace')."</button> type=\"submit\">".__('Replace')."</button>
<button class=\"danger\" dojoType=\"dijit.form.Button\" onclick=\"return removeFeedIcon($feed_id);\" <button class=\"btn-danger\" dojoType=\"dijit.form.Button\" onclick=\"return removeFeedIcon($feed_id);\"
type=\"submit\">".__('Remove')."</button> type=\"submit\">".__('Remove')."</button>
</form>"; </form>";
@ -760,7 +760,7 @@ class Pref_Feeds extends Handler_Protected {
print "<div class='dlgButtons'> print "<div class='dlgButtons'>
<div style=\"float : left\"> <div style=\"float : left\">
<button class=\"danger\" dojoType=\"dijit.form.Button\" onclick='return unsubscribeFeed($feed_id, \"$title\")'>". <button class=\"btn-danger\" dojoType=\"dijit.form.Button\" onclick='return unsubscribeFeed($feed_id, \"$title\")'>".
__('Unsubscribe')."</button>"; __('Unsubscribe')."</button>";
print "</div>"; print "</div>";
@ -1467,7 +1467,7 @@ class Pref_Feeds extends Handler_Protected {
print "<div class='dlgButtons'>"; print "<div class='dlgButtons'>";
print "<div style='float : left'>"; print "<div style='float : left'>";
print "<button class=\"danger\" dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('inactiveFeedsDlg').removeSelected()\">" print "<button class=\"btn-danger\" dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('inactiveFeedsDlg').removeSelected()\">"
.__('Unsubscribe from selected feeds')."</button> "; .__('Unsubscribe from selected feeds')."</button> ";
print "</div>"; print "</div>";
@ -1534,7 +1534,7 @@ class Pref_Feeds extends Handler_Protected {
print "<div class='dlgButtons'>"; print "<div class='dlgButtons'>";
print "<div style='float : left'>"; print "<div style='float : left'>";
print "<button class=\"danger\" dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('errorFeedsDlg').removeSelected()\">" print "<button class=\"btn-danger\" dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('errorFeedsDlg').removeSelected()\">"
.__('Unsubscribe from selected feeds')."</button> "; .__('Unsubscribe from selected feeds')."</button> ";
print "</div>"; print "</div>";

4
classes/pref/filters.php
View file

@ -514,14 +514,14 @@ class Pref_Filters extends Handler_Protected {
print "<div class=\"dlgButtons\">"; print "<div class=\"dlgButtons\">";
print "<div style=\"float : left\">"; print "<div style=\"float : left\">";
print "<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('filterEditDlg').removeFilter()\">". print "<button dojoType=\"dijit.form.Button\" class=\"btn-danger\" onclick=\"return dijit.byId('filterEditDlg').removeFilter()\">".
__('Remove')."</button>"; __('Remove')."</button>";
print "</div>"; print "</div>";
print "<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('filterEditDlg').test()\">". print "<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('filterEditDlg').test()\">".
__('Test')."</button> "; __('Test')."</button> ";
print "<button dojoType=\"dijit.form.Button\" type=\"submit\" class=\"primary\" onclick=\"return dijit.byId('filterEditDlg').execute()\">". print "<button dojoType=\"dijit.form.Button\" type=\"submit\" class=\"btn-primary\" onclick=\"return dijit.byId('filterEditDlg').execute()\">".
__('Save')."</button> "; __('Save')."</button> ";
print "<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('filterEditDlg').hide()\">". print "<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('filterEditDlg').hide()\">".

2
classes/pref/labels.php
View file

@ -78,7 +78,7 @@ class Pref_Labels extends Handler_Protected {
# print "</form>"; # print "</form>";
print "<div class=\"dlgButtons\">"; print "<div class=\"dlgButtons\">";
print "<button dojoType=\"dijit.form.Button\" type=\"submit\" class=\"primary\" onclick=\"dijit.byId('labelEditDlg').execute()\">". print "<button dojoType=\"dijit.form.Button\" type=\"submit\" class=\"btn-primary\" onclick=\"dijit.byId('labelEditDlg').execute()\">".
__('Save')."</button>"; __('Save')."</button>";
print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('labelEditDlg').hide()\">". print "<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('labelEditDlg').hide()\">".
__('Cancel')."</button>"; __('Cancel')."</button>";

2
css/default.css
View file

File diff suppressed because one or more lines are too long

63
css/dijit.less
View file

@ -184,11 +184,13 @@
/* Various buttons */ /* Various buttons */
.dijitButton.danger .dijitButtonText { /* danger */
.dijitButton.btn-danger .dijitButtonText {
color: #ffffff; color: #ffffff;
} }
.dijitButton.danger { .dijitButton.btn-danger {
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
background-color: #da4f49; background-color: #da4f49;
*background-color: #bd362f; *background-color: #bd362f;
@ -204,19 +206,62 @@
filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
} }
.dijitButton.dijitButtonDisabled.danger, .dijitButton.dijitButtonDisabled.btn-danger,
.dijitButton.dijitButtonActive.danger, .dijitButton.dijitButtonActive.btn-danger,
.dijitButton.dijitButtonHover.danger, .dijitButton.dijitButtonHover.btn-danger,
.dijitButton.dijitFocused.danger { .dijitButton.dijitFocused.btn-danger {
color: #ffffff; color: #ffffff;
background-color: #bd362f; background-color: #bd362f;
*background-color: #a9302a; *background-color: #a9302a;
} }
.dijitButton.dijitButtonActive.danger { .dijitButton.dijitButtonActive.btn-danger {
background-color: #942a25 \9; background-color: #942a25 \9;
} }
.dijitButton.dijitButtonActive.btn-danger {
color: rgba(255, 255, 255, 0.75);
}
/* primary */
.dijitButton.btn-primary .dijitButtonText {
color: #ffffff;
}
.dijitButton.btn-primary {
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
background-color: #2883b3;
*background-color: #257aa7;
background-image: -moz-linear-gradient(top, #4ba6d8, #257aa7);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#4ba6d8), to(#257aa7));
background-image: -webkit-linear-gradient(top, #4ba6d8, #257aa7);
background-image: -o-linear-gradient(top, #4ba6d8, #257aa7);
background-image: linear-gradient(to bottom, #4ba6d8, #257aa7);
background-repeat: repeat-x;
border-color: #257aa7 #257aa7 #1d5f82;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
}
.dijitButton.dijitButtonDisabled.btn-primary,
.dijitButton.dijitButtonActive.btn-primary,
.dijitButton.dijitButtonHover.btn-primary,
.dijitButton.dijitFocused.btn-primary {
color: #ffffff;
background-color: #257aa7;
*background-color: #1d6185;
}
.dijitButton.dijitButtonActive.btn-primary {
background-color: #1f678d \9;
}
.dijitButton.dijitButtonActive.btn-primary {
color: rgba(255, 255, 255, 0.75);
}
/* others */
.dijitDropDownButton { .dijitDropDownButton {
margin: 0px; margin: 0px;
} }
@ -225,10 +270,6 @@
padding: 0px; padding: 0px;
} }
.dijitButton.dijitButtonActive.danger {
color: rgba(255, 255, 255, 0.75);
}
.dijitButton .dijitButtonNode, .dijitButton .dijitButtonNode,
.dijitDropDownButton .dijitButtonNode, .dijitDropDownButton .dijitButtonNode,
.dijitComboButton .dijitButtonNode, .dijitComboButton .dijitButtonNode,

2
plugins/share/init.php
View file

@ -40,7 +40,7 @@ class Share extends Plugin {
print "<p>" . __("You can disable all articles shared by unique URLs here.") . "</p>"; print "<p>" . __("You can disable all articles shared by unique URLs here.") . "</p>";
print "<button class=\"danger\" dojoType=\"dijit.form.Button\" onclick=\"return clearArticleAccessKeys()\">". print "<button class=\"btn-danger\" dojoType=\"dijit.form.Button\" onclick=\"return clearArticleAccessKeys()\">".
__('Unshare all articles')."</button> "; __('Unshare all articles')."</button> ";
print "</p>"; print "</p>";