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

remove seemingly useless bordercontainer from main layout

This commit is contained in:
Andrew Dolgov 2018-12-05 10:33:30 +03:00
parent 5b3d5a28f2
commit 2cd1ec5816
8 changed files with 185 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
css/default.css
View File

@ -605,11 +605,6 @@ body.ttrss_main div.fatalError textarea {
width: 565px; width: 565px;
height: 200px; height: 200px;
} }
body.ttrss_main #header-wrap {
border-width: 0px;
margin: 0px;
padding: 0px;
}
body.ttrss_main #content-wrap { body.ttrss_main #content-wrap {
padding: 0px; padding: 0px;
border-width: 0px; border-width: 0px;
@ -779,12 +774,6 @@ body.ttrss_main #header {
top: 0px; top: 0px;
z-index: 5; z-index: 5;
} }
body.ttrss_main #footer {
text-align: center;
color: #555555;
padding: 4px 4px 8px 4px;
border-width: 0px;
}
body.ttrss_main #content-insert { body.ttrss_main #content-insert {
padding: 0px; padding: 0px;
border-color: #ddd; border-color: #ddd;
@ -1342,9 +1331,20 @@ body.ttrss_prefs {
} }
body.ttrss_prefs #footer, body.ttrss_prefs #footer,
body.ttrss_prefs #header { body.ttrss_prefs #header {
padding: 8px;
font-size: 13px;
}
body.ttrss_prefs #header {
float: right;
}
body.ttrss_prefs #footer_splitter {
display: none;
}
body.ttrss_prefs #footer {
background-color: #f5f5f5; background-color: #f5f5f5;
padding-left: 8px; font-size: 13px;
padding-right: 8px; border: 0px;
text-align: center;
} }
body.ttrss_prefs #header a:hover { body.ttrss_prefs #header a:hover {
color: black; color: black;

2
css/default.css.map
View File

File diff suppressed because one or more lines are too long

18
css/prefs.less
View File

@ -4,9 +4,23 @@ body.ttrss_prefs {
font-size: 14px; font-size: 14px;
#footer, #header { #footer, #header {
padding : 8px;
font-size : 13px;
}
#header {
float : right;
}
#footer_splitter {
display : none;
}
#footer {
background-color : #f5f5f5; background-color : #f5f5f5;
padding-left : 8px; font-size : 13px;
padding-right : 8px; border : 0px;
text-align : center;
} }
#header a:hover { #header a:hover {

13
css/tt-rss.less
View File

@ -709,12 +709,6 @@ body.ttrss_main {
} }
} }
#header-wrap {
border-width : 0px;
margin : 0px;
padding : 0px;
}
#content-wrap { #content-wrap {
padding : 0px; padding : 0px;
border-width : 0px; border-width : 0px;
@ -917,13 +911,6 @@ body.ttrss_main {
z-index : 5; z-index : 5;
} }
#footer {
text-align : center;
color : @default-text;
padding : 4px 4px 8px 4px;
border-width : 0px;
}
#content-insert { #content-insert {
padding : 0px; padding : 0px;
border-color : #ddd; border-color : #ddd;

217
index.php
View File

@ -150,135 +150,126 @@
<div id="cmdline" style="display : none"></div> <div id="cmdline" style="display : none"></div>
<div id="main" dojoType="dijit.layout.BorderContainer"> <div id="main" dojoType="dijit.layout.BorderContainer">
<div id="feeds-holder" dojoType="dijit.layout.ContentPane" region="leading" style="width : 20%" splitter="true">
<div id="feedlistLoading">
<img src='images/indicator_tiny.gif'/>
<?php echo __("Loading, please wait..."); ?></div>
<div id="feedTree"></div>
</div>
<div id="feeds-holder" dojoType="dijit.layout.ContentPane" region="leading" style="width : 20%" splitter="true"> <div dojoType="dijit.layout.BorderContainer" region="center" id="content-wrap">
<div id="feedlistLoading"> <div id="toolbar-frame" dojoType="dijit.layout.ContentPane" region="top">
<img src='images/indicator_tiny.gif'/> <div id="toolbar" dojoType="dijit.Toolbar">
<?php echo __("Loading, please wait..."); ?></div>
<div id="feedTree"></div>
</div>
<div dojoType="dijit.layout.BorderContainer" region="center" id="header-wrap" gutters="false"> <?php
<div dojoType="dijit.layout.BorderContainer" region="center" id="content-wrap"> foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_MAIN_TOOLBAR_BUTTON) as $p) {
echo $p->hook_main_toolbar_button();
}
?>
<div id="toolbar-frame" dojoType="dijit.layout.ContentPane" region="top"> <form id="toolbar-headlines" action="" onsubmit='return false'>
<div id="toolbar" dojoType="dijit.Toolbar">
<?php </form>
foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_MAIN_TOOLBAR_BUTTON) as $p) {
echo $p->hook_main_toolbar_button();
}
?>
<form id="toolbar-headlines" action="" onsubmit='return false'> <form id="toolbar-main" action="" onsubmit='return false'>
</form> <select name="view_mode" title="<?php echo __('Show articles') ?>"
onchange="App.onViewModeChanged()"
dojoType="dijit.form.Select">
<option selected="selected" value="adaptive"><?php echo __('Adaptive') ?></option>
<option value="all_articles"><?php echo __('All Articles') ?></option>
<option value="marked"><?php echo __('Starred') ?></option>
<option value="published"><?php echo __('Published') ?></option>
<option value="unread"><?php echo __('Unread') ?></option>
<option value="has_note"><?php echo __('With Note') ?></option>
<!-- <option value="noscores"><?php echo __('Ignore Scoring') ?></option> -->
</select>
<form id="toolbar-main" action="" onsubmit='return false'> <select title="<?php echo __('Sort articles') ?>"
onchange="App.onViewModeChanged()"
dojoType="dijit.form.Select" name="order_by">
<option selected="selected" value="default"><?php echo __('Default') ?></option>
<option value="feed_dates"><?php echo __('Newest first') ?></option>
<option value="date_reverse"><?php echo __('Oldest first') ?></option>
<option value="title"><?php echo __('Title') ?></option>
</select>
<select name="view_mode" title="<?php echo __('Show articles') ?>" <div dojoType="dijit.form.ComboButton" onclick="Feeds.catchupCurrent()">
onchange="App.onViewModeChanged()" <span><?php echo __('Mark as read') ?></span>
dojoType="dijit.form.Select"> <div dojoType="dijit.DropDownMenu">
<option selected="selected" value="adaptive"><?php echo __('Adaptive') ?></option> <div dojoType="dijit.MenuItem" onclick="Feeds.catchupCurrent('1day')">
<option value="all_articles"><?php echo __('All Articles') ?></option> <?php echo __('Older than one day') ?>
<option value="marked"><?php echo __('Starred') ?></option> </div>
<option value="published"><?php echo __('Published') ?></option> <div dojoType="dijit.MenuItem" onclick="Feeds.catchupCurrent('1week')">
<option value="unread"><?php echo __('Unread') ?></option> <?php echo __('Older than one week') ?>
<option value="has_note"><?php echo __('With Note') ?></option> </div>
<!-- <option value="noscores"><?php echo __('Ignore Scoring') ?></option> --> <div dojoType="dijit.MenuItem" onclick="Feeds.catchupCurrent('2week')">
</select> <?php echo __('Older than two weeks') ?>
</div>
</div>
</div>
<select title="<?php echo __('Sort articles') ?>" </form>
onchange="App.onViewModeChanged()"
dojoType="dijit.form.Select" name="order_by">
<option selected="selected" value="default"><?php echo __('Default') ?></option>
<option value="feed_dates"><?php echo __('Newest first') ?></option>
<option value="date_reverse"><?php echo __('Oldest first') ?></option>
<option value="title"><?php echo __('Title') ?></option>
</select>
<div dojoType="dijit.form.ComboButton" onclick="Feeds.catchupCurrent()"> <div class="action-chooser">
<span><?php echo __('Mark as read') ?></span>
<div dojoType="dijit.DropDownMenu">
<div dojoType="dijit.MenuItem" onclick="Feeds.catchupCurrent('1day')">
<?php echo __('Older than one day') ?>
</div>
<div dojoType="dijit.MenuItem" onclick="Feeds.catchupCurrent('1week')">
<?php echo __('Older than one week') ?>
</div>
<div dojoType="dijit.MenuItem" onclick="Feeds.catchupCurrent('2week')">
<?php echo __('Older than two weeks') ?>
</div>
</div>
</div>
</form> <?php
foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_TOOLBAR_BUTTON) as $p) {
echo $p->hook_toolbar_button();
}
?>
<div class="action-chooser"> <button id="net-alert" dojoType="dijit.form.Button" style="display : none" disabled="true"
title="<?php echo __("Communication problem with server.") ?>">
<img src="images/error.png" />
</button>
<?php <div dojoType="dijit.form.DropDownButton">
foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_TOOLBAR_BUTTON) as $p) { <span><?php echo __('Actions...') ?></span>
echo $p->hook_toolbar_button(); <div dojoType="dijit.Menu" style="display: none">
} <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcPrefs')"><?php echo __('Preferences...') ?></div>
?> <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcSearch')"><?php echo __('Search...') ?></div>
<div dojoType="dijit.MenuItem" disabled="1"><?php echo __('Feed actions:') ?></div>
<div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcAddFeed')"><?php echo __('Subscribe to feed...') ?></div>
<div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcEditFeed')"><?php echo __('Edit this feed...') ?></div>
<div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcRemoveFeed')"><?php echo __('Unsubscribe') ?></div>
<div dojoType="dijit.MenuItem" disabled="1"><?php echo __('All feeds:') ?></div>
<div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcCatchupAll')"><?php echo __('Mark as read') ?></div>
<div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcShowOnlyUnread')"><?php echo __('(Un)hide read feeds') ?></div>
<div dojoType="dijit.MenuItem" disabled="1"><?php echo __('Other actions:') ?></div>
<div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcToggleWidescreen')"><?php echo __('Toggle widescreen mode') ?></div>
<div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcHKhelp')"><?php echo __('Keyboard shortcuts help') ?></div>
<button id="net-alert" dojoType="dijit.form.Button" style="display : none" disabled="true" <?php
title="<?php echo __("Communication problem with server.") ?>"> foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ACTION_ITEM) as $p) {
<img src="images/error.png" /> echo $p->hook_action_item();
</button> }
?>
<div dojoType="dijit.form.DropDownButton"> <?php if (!$_SESSION["hide_logout"]) { ?>
<span><?php echo __('Actions...') ?></span> <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcLogout')"><?php echo __('Logout') ?></div>
<div dojoType="dijit.Menu" style="display: none"> <?php } ?>
<div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcPrefs')"><?php echo __('Preferences...') ?></div> </div>
<div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcSearch')"><?php echo __('Search...') ?></div> </div>
<div dojoType="dijit.MenuItem" disabled="1"><?php echo __('Feed actions:') ?></div>
<div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcAddFeed')"><?php echo __('Subscribe to feed...') ?></div>
<div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcEditFeed')"><?php echo __('Edit this feed...') ?></div>
<div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcRemoveFeed')"><?php echo __('Unsubscribe') ?></div>
<div dojoType="dijit.MenuItem" disabled="1"><?php echo __('All feeds:') ?></div>
<div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcCatchupAll')"><?php echo __('Mark as read') ?></div>
<div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcShowOnlyUnread')"><?php echo __('(Un)hide read feeds') ?></div>
<div dojoType="dijit.MenuItem" disabled="1"><?php echo __('Other actions:') ?></div>
<div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcToggleWidescreen')"><?php echo __('Toggle widescreen mode') ?></div>
<div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcHKhelp')"><?php echo __('Keyboard shortcuts help') ?></div>
<?php <button id="updatesIcon" dojoType="dijit.form.Button" style="display : none">
foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ACTION_ITEM) as $p) { <img src="images/new_version.png" title="<?php echo __('Updates are available from Git.') ?>"/>
echo $p->hook_action_item(); </button>
} </div>
?> </div> <!-- toolbar -->
</div> <!-- toolbar pane -->
<?php if (!$_SESSION["hide_logout"]) { ?> <div id="headlines-wrap-inner" dojoType="dijit.layout.BorderContainer" region="center">
<div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcLogout')"><?php echo __('Logout') ?></div> <div id="floatingTitle" style="display : none"></div>
<?php } ?> <div id="headlines-frame" dojoType="dijit.layout.ContentPane" tabindex="0"
</div> region="center">
</div> <div id="headlinesInnerContainer">
<div class="whiteBox"><?php echo __('Loading, please wait...') ?></div>
<button id="updatesIcon" dojoType="dijit.form.Button" style="display : none"> </div>
<img src="images/new_version.png" title="<?php echo __('Updates are available from Git.') ?>"/> </div>
</button> <div id="content-insert" dojoType="dijit.layout.ContentPane" region="bottom"
</div> style="height : 50%" splitter="true"></div>
</div> <!-- toolbar --> </div>
</div> <!-- toolbar pane --> </div>
<div id="headlines-wrap-inner" dojoType="dijit.layout.BorderContainer" region="center">
<div id="floatingTitle" style="display : none"></div>
<div id="headlines-frame" dojoType="dijit.layout.ContentPane" tabindex="0"
region="center">
<div id="headlinesInnerContainer">
<div class="whiteBox"><?php echo __('Loading, please wait...') ?></div>
</div>
</div>
<div id="content-insert" dojoType="dijit.layout.ContentPane" region="bottom"
style="height : 50%" splitter="true"></div>
</div>
</div>
</div>
</div> </div>
</body> </body>

77
prefs.php
View File

@ -115,51 +115,48 @@
</div> </div>
</div> </div>
<div id="header" dojoType="dijit.layout.ContentPane" region="top"> <div id="header">
<!-- <a href='#' onclick="showHelp()"><?php echo __("Keyboard shortcuts") ?></a> | --> <!-- <a href='#' onclick="showHelp()"><?php echo __("Keyboard shortcuts") ?></a> | -->
<a href="#" onclick="document.location.href = 'index.php'"><?php echo __('Exit preferences') ?></a> <a href="#" onclick="document.location.href = 'index.php'"><?php echo __('Exit preferences') ?></a>
</div> </div>
<div id="main" dojoType="dijit.layout.BorderContainer"> <div id="main" dojoType="dijit.layout.BorderContainer">
<div dojoType="dijit.layout.TabContainer" region="center" id="pref-tabs">
<div dojoType="dijit.layout.TabContainer" region="center" id="pref-tabs"> <div id="genConfigTab" dojoType="dijit.layout.ContentPane"
<div id="genConfigTab" dojoType="dijit.layout.ContentPane" href="backend.php?op=pref-prefs"
href="backend.php?op=pref-prefs" title="<?php echo __('Preferences') ?>"></div>
title="<?php echo __('Preferences') ?>"></div> <div id="feedConfigTab" dojoType="dijit.layout.ContentPane"
<div id="feedConfigTab" dojoType="dijit.layout.ContentPane" href="backend.php?op=pref-feeds"
href="backend.php?op=pref-feeds" title="<?php echo __('Feeds') ?>"></div>
title="<?php echo __('Feeds') ?>"></div> <div id="filterConfigTab" dojoType="dijit.layout.ContentPane"
<div id="filterConfigTab" dojoType="dijit.layout.ContentPane" href="backend.php?op=pref-filters"
href="backend.php?op=pref-filters" title="<?php echo __('Filters') ?>"></div>
title="<?php echo __('Filters') ?>"></div> <div id="labelConfigTab" dojoType="dijit.layout.ContentPane"
<div id="labelConfigTab" dojoType="dijit.layout.ContentPane" href="backend.php?op=pref-labels"
href="backend.php?op=pref-labels" title="<?php echo __('Labels') ?>"></div>
title="<?php echo __('Labels') ?>"></div> <?php if ($_SESSION["access_level"] >= 10) { ?>
<?php if ($_SESSION["access_level"] >= 10) { ?> <div id="userConfigTab" dojoType="dijit.layout.ContentPane"
<div id="userConfigTab" dojoType="dijit.layout.ContentPane" href="backend.php?op=pref-users"
href="backend.php?op=pref-users" title="<?php echo __('Users') ?>"></div>
title="<?php echo __('Users') ?>"></div> <div id="systemConfigTab" dojoType="dijit.layout.ContentPane"
<div id="systemConfigTab" dojoType="dijit.layout.ContentPane" href="backend.php?op=pref-system"
href="backend.php?op=pref-system" title="<?php echo __('System') ?>"></div>
title="<?php echo __('System') ?>"></div> <?php } ?>
<?php } ?> <?php
<?php PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TABS,
PluginHost::getInstance()->run_hooks(PluginHost::HOOK_PREFS_TABS, "hook_prefs_tabs", false);
"hook_prefs_tabs", false); ?>
?> </div>
</div> <div id="footer" dojoType="dijit.layout.ContentPane" region="bottom">
<a class="insensitive" target="_blank" href="http://tt-rss.org/">
<div id="footer" dojoType="dijit.layout.ContentPane" region="bottom"> Tiny Tiny RSS</a>
<a class="insensitive" target="_blank" href="http://tt-rss.org/"> <?php if (!defined('HIDE_VERSION')) { ?>
Tiny Tiny RSS</a> v<?php echo VERSION ?>
<?php if (!defined('HIDE_VERSION')) { ?> <?php } ?>
v<?php echo VERSION ?> &copy; 2005-<?php echo date('Y') ?>
<?php } ?> <a class="insensitive" target="_blank"
&copy; 2005-<?php echo date('Y') ?> href="http://fakecake.org/">Andrew Dolgov</a>
<a class="insensitive" target="_blank" </div> <!-- footer -->
href="http://fakecake.org/">Andrew Dolgov</a>
</div> <!-- footer -->
</div> </div>
</body> </body>

26
themes/night.css
View File

@ -605,11 +605,6 @@ body.ttrss_main div.fatalError textarea {
width: 565px; width: 565px;
height: 200px; height: 200px;
} }
body.ttrss_main #header-wrap {
border-width: 0px;
margin: 0px;
padding: 0px;
}
body.ttrss_main #content-wrap { body.ttrss_main #content-wrap {
padding: 0px; padding: 0px;
border-width: 0px; border-width: 0px;
@ -779,12 +774,6 @@ body.ttrss_main #header {
top: 0px; top: 0px;
z-index: 5; z-index: 5;
} }
body.ttrss_main #footer {
text-align: center;
color: #555555;
padding: 4px 4px 8px 4px;
border-width: 0px;
}
body.ttrss_main #content-insert { body.ttrss_main #content-insert {
padding: 0px; padding: 0px;
border-color: #ddd; border-color: #ddd;
@ -1342,9 +1331,20 @@ body.ttrss_prefs {
} }
body.ttrss_prefs #footer, body.ttrss_prefs #footer,
body.ttrss_prefs #header { body.ttrss_prefs #header {
padding: 8px;
font-size: 13px;
}
body.ttrss_prefs #header {
float: right;
}
body.ttrss_prefs #footer_splitter {
display: none;
}
body.ttrss_prefs #footer {
background-color: #f5f5f5; background-color: #f5f5f5;
padding-left: 8px; font-size: 13px;
padding-right: 8px; border: 0px;
text-align: center;
} }
body.ttrss_prefs #header a:hover { body.ttrss_prefs #header a:hover {
color: black; color: black;

2
themes/night.css.map
View File

File diff suppressed because one or more lines are too long