valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updates for flat theme (mostly disable old dijit overrides)

This commit is contained in:
Andrew Dolgov 2018-12-04 19:03:42 +03:00
parent 563a46f55a
commit 6befff30d7
14 changed files with 2570 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -6,6 +6,7 @@ Thumbs.db
*.DS_Store
#*
.idea/*
css/*.map
plugins.local/*
themes.local/*
config.php

4
classes/feeds.php
View File

@ -1019,7 +1019,7 @@ class Feeds extends Handler_Protected {
__('This feed requires authentication.')."</div>";
print "<div class=\"dlgButtons\">
<button dojoType=\"dijit.form.Button\" class=\"btn-primary\" type=\"submit\" onclick=\"return dijit.byId('feedAddDlg').execute()\">".__('Subscribe')."</button>";
<button dojoType=\"dijit.form.Button\" class=\"alt-primary\" type=\"submit\" onclick=\"return dijit.byId('feedAddDlg').execute()\">".__('Subscribe')."</button>";
if (!(defined('_DISABLE_FEED_BROWSER') && _DISABLE_FEED_BROWSER)) {
print "<button dojoType=\"dijit.form.Button\" onclick=\"return CommonDialogs.feedBrowser()\">".__('More feeds')."</button>";
@ -1115,7 +1115,7 @@ class Feeds extends Handler_Protected {
</div>";
}
print "<button dojoType=\"dijit.form.Button\" type=\"submit\" class=\"btn-primary\" onclick=\"dijit.byId('searchDlg').execute()\">".__('Search')."</button>
print "<button dojoType=\"dijit.form.Button\" type=\"submit\" class=\"alt-primary\" onclick=\"dijit.byId('searchDlg').execute()\">".__('Search')."</button>
<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('searchDlg').hide()\">".__('Cancel')."</button>
</div>";

10
classes/pref/feeds.php
View File

@ -747,7 +747,7 @@ class Pref_Feeds extends Handler_Protected {
<input type=\"hidden\" name=\"method\" value=\"uploadicon\">
<button class=\"\" dojoType=\"dijit.form.Button\" onclick=\"return CommonDialogs.uploadFeedIcon();\"
type=\"submit\">".__('Replace')."</button>
<button class=\"btn-danger\" dojoType=\"dijit.form.Button\" onclick=\"return CommonDialogs.removeFeedIcon($feed_id);\"
<button class=\"alt-danger\" dojoType=\"dijit.form.Button\" onclick=\"return CommonDialogs.removeFeedIcon($feed_id);\"
type=\"submit\">".__('Remove')."</button>
</form>";
@ -765,7 +765,7 @@ class Pref_Feeds extends Handler_Protected {
print "<div class='dlgButtons'>
<div style=\"float : left\">
<button class=\"btn-danger\" dojoType=\"dijit.form.Button\" onclick='return CommonDialogs.unsubscribeFeed($feed_id, \"$title\")'>".
<button class=\"alt-danger\" dojoType=\"dijit.form.Button\" onclick='return CommonDialogs.unsubscribeFeed($feed_id, \"$title\")'>".
__('Unsubscribe')."</button>";
print "</div>";
@ -1335,7 +1335,7 @@ class Pref_Feeds extends Handler_Protected {
print "<button dojoType=\"dijit.form.Button\" onclick=\"return App.displayDlg('".__("Show as feed")."','generatedFeed', '$rss_url')\">".
__('Display URL')."</button> ";
print "<button class=\"btn-danger\" dojoType=\"dijit.form.Button\" onclick=\"return Helpers.clearFeedAccessKeys()\">".
print "<button class=\"alt-danger\" dojoType=\"dijit.form.Button\" onclick=\"return Helpers.clearFeedAccessKeys()\">".
__('Clear all generated URLs')."</button> ";
print "</p>";
@ -1463,7 +1463,7 @@ class Pref_Feeds extends Handler_Protected {
print "<div class='dlgButtons'>";
print "<div style='float : left'>";
print "<button class=\"btn-danger\" dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('inactiveFeedsDlg').removeSelected()\">"
print "<button class=\"alt-danger\" dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('inactiveFeedsDlg').removeSelected()\">"
.__('Unsubscribe from selected feeds')."</button> ";
print "</div>";
@ -1527,7 +1527,7 @@ class Pref_Feeds extends Handler_Protected {
print "<div class='dlgButtons'>";
print "<div style='float : left'>";
print "<button class=\"btn-danger\" dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('errorFeedsDlg').removeSelected()\">"
print "<button class=\"alt-danger\" dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('errorFeedsDlg').removeSelected()\">"
.__('Unsubscribe from selected feeds')."</button> ";
print "</div>";

8
classes/pref/filters.php
View File

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

2
classes/pref/labels.php
View File

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

12
classes/pref/prefs.php
View File

@ -227,7 +227,7 @@ class Pref_Prefs extends Handler_Protected {
print_hidden("op", "pref-prefs");
print_hidden("method", "changeemail");
print "<p><button dojoType=\"dijit.form.Button\" type=\"submit\" class=\"btn-primary\">".
print "<p><button dojoType=\"dijit.form.Button\" type=\"submit\" class=\"alt-primary\">".
__("Save data")."</button>";
print "</form>";
@ -298,7 +298,7 @@ class Pref_Prefs extends Handler_Protected {
print_hidden("op", "pref-prefs");
print_hidden("method", "changepassword");
print "<p><button dojoType=\"dijit.form.Button\" type=\"submit\" class=\"btn-primary\">".
print "<p><button dojoType=\"dijit.form.Button\" type=\"submit\" class=\"alt-primary\">".
__("Change password")."</button>";
print "</form>";
@ -403,7 +403,7 @@ class Pref_Prefs extends Handler_Protected {
print "</td></tr>";
print "</table>";
print "<p><button dojoType=\"dijit.form.Button\" type=\"submit\" class=\"btn-primary\">".
print "<p><button dojoType=\"dijit.form.Button\" type=\"submit\" class=\"alt-primary\">".
__("Enable OTP")."</button>";
print "</form>";
@ -653,7 +653,7 @@ class Pref_Prefs extends Handler_Protected {
print_hidden("op", "pref-prefs");
print_hidden("method", "saveconfig");
print "<div dojoType=\"dijit.form.ComboButton\" type=\"submit\" class=\"btn-primary\">
print "<div dojoType=\"dijit.form.ComboButton\" type=\"submit\" class=\"alt-primary\">
<span>".__('Save configuration')."</span>
<div dojoType=\"dijit.DropDownMenu\">
<div dojoType=\"dijit.MenuItem\"
@ -665,7 +665,7 @@ class Pref_Prefs extends Handler_Protected {
print "<button dojoType=\"dijit.form.Button\" onclick=\"return Helpers.editProfiles()\">".
__('Manage profiles')."</button> ";
print "<button dojoType=\"dijit.form.Button\" class=\"btn-danger\" onclick=\"return Helpers.confirmReset()\">".
print "<button dojoType=\"dijit.form.Button\" class=\"alt-danger\" onclick=\"return Helpers.confirmReset()\">".
__('Reset to defaults')."</button>";
print "&nbsp;";
@ -1096,7 +1096,7 @@ class Pref_Prefs extends Handler_Protected {
print "<div class='dlgButtons'>
<div style='float : left'>
<button class=\"btn-danger\" dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('profileEditDlg').removeSelected()\">".
<button class=\"alt-danger\" dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('profileEditDlg').removeSelected()\">".
__('Remove selected profiles')."</button>
<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('profileEditDlg').activateProfile()\">".
__('Activate profile')."</button>

2
classes/pref/system.php
View File

@ -40,7 +40,7 @@ class Pref_System extends Handler_Protected {
onclick=\"Helpers.updateEventLog()\">".__('Refresh')."</button> ";
print "&nbsp;<button dojoType=\"dijit.form.Button\"
class=\"btn-danger\" onclick=\"Helpers.clearEventLog()\">".__('Clear')."</button> ";
class=\"alt-danger\" onclick=\"Helpers.clearEventLog()\">".__('Clear')."</button> ";
print "<p><table width=\"100%\" cellspacing=\"10\" class=\"prefErrorLog\">";

2
classes/pref/users.php
View File

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

2490
css/default.css
View File

File diff suppressed because one or more lines are too long

47
css/dijit.less
View File

@ -1,3 +1,50 @@
.flat {
.dijitTree .filterRules span.inverse,
#filterDlg_Matches span.filterRule.inverse {
color: red;
}
.dijitToolbar {
font-size : 13px;
}
.dijitTree {
.dijitFolderClosed,
.dijitFolderOpened {
display: none;
}
.filterRules span {
display: block;
color: green;
}
#filterDlg_Matches span.filterRule {
color: green;
}
.labelParam {
float: right;
margin-right: 1em;
}
.feedParam {
color: @default-text;
float: right;
margin-right: 1em;
}
.filterRules {
display: block;
color: #ccc;
font-size: 12px;
margin-left: 100px;
line-height : normal;
}
}
}
/* Tree */
.claro {

4
css/prefs.less
View File

@ -1,5 +1,7 @@
body.ttrss_prefs {
background-color : #f5f5f5;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 13px;
#footer, #header {
background-color : #f5f5f5;
@ -127,7 +129,5 @@ body.ttrss_prefs {
max-width : 100%;
}
}

18
css/tt-rss.less
View File

@ -813,7 +813,7 @@ body.ttrss_main {
box-shadow : inset -1px 0px 2px -1px rgba(0,0,0,0.1);
-webkit-overflow-scrolling : touch;
#feedTree .dijitTreeRow .dijitTreeLabel.Unread {
/* #feedTree .dijitTreeRow .dijitTreeLabel.Unread {
font-weight : bold;
}
@ -848,13 +848,13 @@ body.ttrss_main {
#feedTree.dijitTree img.tinyFeedIcon {
position : relative;
top : -2px;
}
} */
#feedTree {
height : 100%;
overflow-x : hidden;
text-rendering: optimizelegibility;
font-family : @fonts-ui;
//font-family : @fonts-ui;
.counterNode.aux {
background : #f0f0f0;
@ -929,12 +929,12 @@ body.ttrss_main {
display : none;
}
#content-insert_splitter.dijitSplitterH {
/* #content-insert_splitter.dijitSplitterH {
background : #f0f0f0;
border-color: #ddd;
border-top-width : 1px;
border-style : solid;
}
} */
#toolbar {
padding : 0px;
@ -1085,9 +1085,9 @@ body.ttrss_main {
width : 410px;
}
ul#filterDlg_Matches li div.dijitCheckBox, ul#filterDlg_Actions li div.dijitCheckBox {
/* ul#filterDlg_Matches li div.dijitCheckBox, ul#filterDlg_Actions li div.dijitCheckBox {
margin-right : 5px;
}
} */
span.highlight {
background-color : #ffff00;
@ -1098,7 +1098,7 @@ body.ttrss_main {
}
#headlines-frame .dijitCheckBox {
/* #headlines-frame .dijitCheckBox {
border-width : 0px;
opacity : 0.5;
}
@ -1121,7 +1121,7 @@ body.ttrss_main {
.dijitDropDownButton.attachments {
display : inline-block;
}
} */
#editTagsDlg{
overflow: visible;

2
js/PrefFilterTree.js
View File

@ -183,7 +183,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
Filters.addFilterAction(li, action);
},
removeFilter: function () {
const msg = __("Remove filter?");
const msg = __("FRemove filter?");
if (confirm(msg)) {
this.hide();

2
plugins/share/init.php
View File

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