Browse Source

some small layout fixes, remove a few inline styles

master
Andrew Dolgov 1 year ago
parent
commit
68ecf52594
  1. 2
      classes/pref/prefs.php
  2. 12
      classes/pref/system.php
  3. 25
      classes/pref/users.php
  4. 2
      js/CommonDialogs.js
  5. 2
      js/PrefFeedTree.js
  6. 25
      js/PrefHelpers.js
  7. 54
      themes/compact.css
  8. 54
      themes/compact_night.css
  9. 54
      themes/light.css
  10. 62
      themes/light/prefs.less
  11. 54
      themes/night.css
  12. 54
      themes/night_blue.css

2
classes/pref/prefs.php

@ -878,7 +878,7 @@ class Pref_Prefs extends Handler_Protected {
?> -->
<ul id="prefs-plugin-list" class="prefs-plugin-list list-unstyled">
<li><?= __("Loading, please wait...") ?></li>
<li class='text-center'><?= __("Loading, please wait...") ?></li>
</ul>
</div>

12
classes/pref/system.php

@ -117,12 +117,12 @@ class Pref_System extends Handler_Administrative {
<table width='100%' class='event-log'>
<tr class='title'>
<td width='5%'><?= __("Error") ?></td>
<td><?= __("Filename") ?></td>
<td><?= __("Message") ?></td>
<td width='5%'><?= __("User") ?></td>
<td width='5%'><?= __("Date") ?></td>
<tr>
<th width='5%'><?= __("Error") ?></th>
<th><?= __("Filename") ?></th>
<th><?= __("Message") ?></th>
<th width='5%'><?= __("User") ?></th>
<th width='5%'><?= __("Date") ?></th>
</tr>
<?php

25
classes/pref/users.php

@ -248,13 +248,13 @@ class Pref_Users extends Handler_Administrative {
<table width='100%' class='users-list' id='users-list'>
<tr class='title'>
<td align='center' width='5%'> </td>
<td width='20%'><a href='#' onclick="Users.reload('login')"><?= ('Login') ?></a></td>
<td width='20%'><a href='#' onclick="Users.reload('access_level')"><?= ('Access Level') ?></a></td>
<td width='10%'><a href='#' onclick="Users.reload('num_feeds')"><?= ('Subscribed feeds') ?></a></td>
<td width='20%'><a href='#' onclick="Users.reload('created')"><?= ('Registered') ?></a></td>
<td width='20%'><a href='#' onclick="Users.reload('last_login')"><?= ('Last login') ?></a></td>
<tr>
<th></th>
<th><a href='#' onclick="Users.reload('login')"><?= ('Login') ?></a></th>
<th><a href='#' onclick="Users.reload('access_level')"><?= ('Access Level') ?></a></th>
<th><a href='#' onclick="Users.reload('num_feeds')"><?= ('Subscribed feeds') ?></a></th>
<th><a href='#' onclick="Users.reload('created')"><?= ('Registered') ?></a></th>
<th><a href='#' onclick="Users.reload('last_login')"><?= ('Last login') ?></a></th>
</tr>
<?php
@ -270,16 +270,19 @@ class Pref_Users extends Handler_Administrative {
foreach ($users as $user) { ?>
<tr data-row-id='<?= $user["id"] ?>' onclick='Users.edit(<?= $user["id"] ?>)' title="<?= __('Click to edit') ?>">
<td align='center'>
<td class='checkbox'>
<input onclick='Tables.onRowChecked(this); event.stopPropagation();'
dojoType='dijit.form.CheckBox' type='checkbox'>
</td>
<td><i class='material-icons'>person</i> <?= htmlspecialchars($user["login"]) ?></td>
<td width='30%'>
<i class='material-icons'>person</i>
<strong><?= htmlspecialchars($user["login"]) ?></strong>
</td>
<td><?= $access_level_names[$user["access_level"]] ?></td>
<td><?= $user["num_feeds"] ?></td>
<td><?= TimeHelper::make_local_datetime($user["created"], false) ?></td>
<td><?= TimeHelper::make_local_datetime($user["last_login"], false) ?></td>
<td class='text-muted'><?= TimeHelper::make_local_datetime($user["created"], false) ?></td>
<td class='text-muted'><?= TimeHelper::make_local_datetime($user["last_login"], false) ?></td>
</tr>
<?php } ?>
</table>

2
js/CommonDialogs.js

@ -248,7 +248,7 @@ const CommonDialogs = {
${reply.map((row) => `
<tr data-row-id='${row.id}'>
<td width='5%' align='center'>
<td class='checkbox'>
<input onclick='Tables.onRowChecked(this)' dojoType="dijit.form.CheckBox"
type="checkbox">
</td>

2
js/PrefFeedTree.js

@ -513,7 +513,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dojo/_b
<div class='panel panel-scrollable'>
<table width='100%' id='inactive-feeds-list'>
${reply.map((row) => `<tr data-row-id='${row.id}'>
<td width='5%' align='center'>
<td class='checkbox'>
<input onclick='Tables.onRowChecked(this)' dojoType='dijit.form.CheckBox' type='checkbox'>
</td>
<td>

25
js/PrefHelpers.js

@ -183,7 +183,7 @@ const Helpers = {
<table width='100%' id='pref-profiles-list'>
${reply.map((profile) => `
<tr data-row-id="${profile.id}">
<td width='5%'>
<td class='checkbox'>
${App.FormFields.checkbox_tag("", false, "", {onclick: 'Tables.onRowChecked(this)'})}
</td>
<td>
@ -533,17 +533,15 @@ const Helpers = {
disabled: is_installed,
onclick: `App.dialogOf(this).performInstall("${App.escapeHtml(plugin.name)}")`})}
<h3 style="margin-top: 0">${plugin.name}
<h3>${plugin.name}
<a target="_blank" href="${App.escapeHtml(plugin.html_url)}">
${App.FormFields.icon("open_in_new_window")}
</a>
</h3>
<div class='text-muted'>${__("Updated: %s").replace("%s", plugin.last_update)}</div>
<div class='small text-muted'>${__("Updated: %s").replace("%s", plugin.last_update)}</div>
<p>${plugin.description}</p>
<hr/>
<div class='description'>${plugin.description}</div>
</li>
`
}
@ -626,13 +624,14 @@ const Helpers = {
container.innerHTML +=
`
<li><h3 style="margin-top: 0">${p.plugin}</h3>
<li>
<h3>${p.plugin}</h3>
${p.rv.e ? `<pre class="small text-error pre-wrap">${p.rv.e}</pre>` : ''}
${p.rv.o ? `<pre class="small text-success pre-wrap">${p.rv.o}</pre>` : ''}
<p class="small">
<div class="small">
${p.rv.s ? App.FormFields.icon("error_outline") + " " + __("Exited with RC: %d").replace("%d", p.rv.s) :
App.FormFields.icon("check") + " " + __("Update done.")}
</p>
</div>
</li>
`
});
@ -642,7 +641,7 @@ const Helpers = {
});
},
content: `
<ul class="panel panel-scrollable update-results">
<ul class="panel panel-scrollable plugin-updater-list update-results">
<li class='text-center'>${__("Looking for changes...")}</li>
</ul>
@ -681,13 +680,13 @@ const Helpers = {
container.innerHTML +=
`
<li><h3 style="margin-top: 0">${p.plugin}</h3>
<li><h3>${p.plugin}</h3>
${p.rv.e ? `<pre class="small text-error pre-wrap">${p.rv.e}</pre>` : ''}
${p.rv.o ? `<pre class="small text-success pre-wrap">${p.rv.o}</pre>` : ''}
<p class="small">
<div class="small">
${p.rv.s ? App.FormFields.icon("error_outline") + " " + __("Exited with RC: %d").replace("%d", p.rv.s) :
App.FormFields.icon("check") + " " + __("Ready to update")}
</p>
</div>
</li>
`
});

54
themes/compact.css

@ -1511,8 +1511,12 @@ body.ttrss_prefs fieldset.plugin label.description {
body.ttrss_prefs fieldset.plugin label.description .dijitCheckBox {
margin-right: 10px;
}
body.ttrss_prefs .users-list td {
cursor: pointer;
body.ttrss_prefs table th {
text-align: left;
}
body.ttrss_prefs table td.checkbox {
text-align: center;
width: 32px;
}
body.ttrss_prefs ul.prefs-plugin-list {
margin: 0;
@ -1521,17 +1525,20 @@ body.ttrss_prefs ul.prefs-plugin-list {
body.ttrss_prefs ul.prefs-plugin-list li {
display: flex;
align-items: center;
line-height: 30px;
border-bottom: #ddd 1px solid;
line-height: 16px;
}
body.ttrss_prefs ul.prefs-plugin-list li.text-center {
border: 0;
display: block;
}
body.ttrss_prefs ul.prefs-plugin-list li > * {
padding: 4px;
padding: 8px;
}
body.ttrss_prefs ul.prefs-plugin-list li label.checkbox {
display: flex;
align-items: center;
min-width: 200px;
margin-right: 16px;
cursor: pointer;
}
body.ttrss_prefs ul.prefs-plugin-list li label.checkbox.system {
@ -1551,16 +1558,41 @@ body.ttrss_prefs ul.prefs-plugin-list li .version {
min-width: 200px;
text-align: right;
}
body.ttrss_prefs .plugin-installer-list .plugin-installed {
body.ttrss_prefs .plugin-installer-list li,
body.ttrss_prefs .plugin-updater-list li {
border-bottom: #ddd 1px solid;
}
body.ttrss_prefs .plugin-installer-list li > *,
body.ttrss_prefs .plugin-updater-list li > * {
padding: 8px 4px;
}
body.ttrss_prefs .plugin-installer-list li > pre,
body.ttrss_prefs .plugin-updater-list li > pre {
margin: 0;
}
body.ttrss_prefs .plugin-installer-list li h3,
body.ttrss_prefs .plugin-updater-list li h3 {
margin: 0;
}
body.ttrss_prefs .plugin-installer-list li.text-center,
body.ttrss_prefs .plugin-updater-list li.text-center {
border: 0;
}
body.ttrss_prefs .plugin-installer-list .plugin-installed > *,
body.ttrss_prefs .plugin-updater-list .plugin-installed > * {
opacity: 0.5;
}
body.ttrss_prefs .event-log tr td {
font-size: 10px;
body.ttrss_prefs .users-list td,
body.ttrss_prefs .event-log td,
body.ttrss_prefs .users-list th,
body.ttrss_prefs .event-log th {
cursor: pointer;
padding: 8px;
border-bottom: #ddd 1px solid;
}
body.ttrss_prefs .event-log tr td,
body.ttrss_prefs .event-log tr th {
vertical-align: top;
border-width: 0 0 1px 0;
border-style: solid;
border-color: #ddd;
}
body.ttrss_prefs .event-log tr .errno {
font-style: italic;

54
themes/compact_night.css

@ -1511,8 +1511,12 @@ body.ttrss_prefs fieldset.plugin label.description {
body.ttrss_prefs fieldset.plugin label.description .dijitCheckBox {
margin-right: 10px;
}
body.ttrss_prefs .users-list td {
cursor: pointer;
body.ttrss_prefs table th {
text-align: left;
}
body.ttrss_prefs table td.checkbox {
text-align: center;
width: 32px;
}
body.ttrss_prefs ul.prefs-plugin-list {
margin: 0;
@ -1521,17 +1525,20 @@ body.ttrss_prefs ul.prefs-plugin-list {
body.ttrss_prefs ul.prefs-plugin-list li {
display: flex;
align-items: center;
line-height: 30px;
border-bottom: #222 1px solid;
line-height: 16px;
}
body.ttrss_prefs ul.prefs-plugin-list li.text-center {
border: 0;
display: block;
}
body.ttrss_prefs ul.prefs-plugin-list li > * {
padding: 4px;
padding: 8px;
}
body.ttrss_prefs ul.prefs-plugin-list li label.checkbox {
display: flex;
align-items: center;
min-width: 200px;
margin-right: 16px;
cursor: pointer;
}
body.ttrss_prefs ul.prefs-plugin-list li label.checkbox.system {
@ -1551,16 +1558,41 @@ body.ttrss_prefs ul.prefs-plugin-list li .version {
min-width: 200px;
text-align: right;
}
body.ttrss_prefs .plugin-installer-list .plugin-installed {
body.ttrss_prefs .plugin-installer-list li,
body.ttrss_prefs .plugin-updater-list li {
border-bottom: #222 1px solid;
}
body.ttrss_prefs .plugin-installer-list li > *,
body.ttrss_prefs .plugin-updater-list li > * {
padding: 8px 4px;
}
body.ttrss_prefs .plugin-installer-list li > pre,
body.ttrss_prefs .plugin-updater-list li > pre {
margin: 0;
}
body.ttrss_prefs .plugin-installer-list li h3,
body.ttrss_prefs .plugin-updater-list li h3 {
margin: 0;
}
body.ttrss_prefs .plugin-installer-list li.text-center,
body.ttrss_prefs .plugin-updater-list li.text-center {
border: 0;
}
body.ttrss_prefs .plugin-installer-list .plugin-installed > *,
body.ttrss_prefs .plugin-updater-list .plugin-installed > * {
opacity: 0.5;
}
body.ttrss_prefs .event-log tr td {
font-size: 10px;
body.ttrss_prefs .users-list td,
body.ttrss_prefs .event-log td,
body.ttrss_prefs .users-list th,
body.ttrss_prefs .event-log th {
cursor: pointer;
padding: 8px;
border-bottom: #222 1px solid;
}
body.ttrss_prefs .event-log tr td,
body.ttrss_prefs .event-log tr th {
vertical-align: top;
border-width: 0 0 1px 0;
border-style: solid;
border-color: #222;
}
body.ttrss_prefs .event-log tr .errno {
font-style: italic;

54
themes/light.css

@ -1511,8 +1511,12 @@ body.ttrss_prefs fieldset.plugin label.description {
body.ttrss_prefs fieldset.plugin label.description .dijitCheckBox {
margin-right: 10px;
}
body.ttrss_prefs .users-list td {
cursor: pointer;
body.ttrss_prefs table th {
text-align: left;
}
body.ttrss_prefs table td.checkbox {
text-align: center;
width: 32px;
}
body.ttrss_prefs ul.prefs-plugin-list {
margin: 0;
@ -1521,17 +1525,20 @@ body.ttrss_prefs ul.prefs-plugin-list {
body.ttrss_prefs ul.prefs-plugin-list li {
display: flex;
align-items: center;
line-height: 30px;
border-bottom: #ddd 1px solid;
line-height: 16px;
}
body.ttrss_prefs ul.prefs-plugin-list li.text-center {
border: 0;
display: block;
}
body.ttrss_prefs ul.prefs-plugin-list li > * {
padding: 4px;
padding: 8px;
}
body.ttrss_prefs ul.prefs-plugin-list li label.checkbox {
display: flex;
align-items: center;
min-width: 200px;
margin-right: 16px;
cursor: pointer;
}
body.ttrss_prefs ul.prefs-plugin-list li label.checkbox.system {
@ -1551,16 +1558,41 @@ body.ttrss_prefs ul.prefs-plugin-list li .version {
min-width: 200px;
text-align: right;
}
body.ttrss_prefs .plugin-installer-list .plugin-installed {
body.ttrss_prefs .plugin-installer-list li,
body.ttrss_prefs .plugin-updater-list li {
border-bottom: #ddd 1px solid;
}
body.ttrss_prefs .plugin-installer-list li > *,
body.ttrss_prefs .plugin-updater-list li > * {
padding: 8px 4px;
}
body.ttrss_prefs .plugin-installer-list li > pre,
body.ttrss_prefs .plugin-updater-list li > pre {
margin: 0;
}
body.ttrss_prefs .plugin-installer-list li h3,
body.ttrss_prefs .plugin-updater-list li h3 {
margin: 0;
}
body.ttrss_prefs .plugin-installer-list li.text-center,
body.ttrss_prefs .plugin-updater-list li.text-center {
border: 0;
}
body.ttrss_prefs .plugin-installer-list .plugin-installed > *,
body.ttrss_prefs .plugin-updater-list .plugin-installed > * {
opacity: 0.5;
}
body.ttrss_prefs .event-log tr td {
font-size: 10px;
body.ttrss_prefs .users-list td,
body.ttrss_prefs .event-log td,
body.ttrss_prefs .users-list th,
body.ttrss_prefs .event-log th {
cursor: pointer;
padding: 8px;
border-bottom: #ddd 1px solid;
}
body.ttrss_prefs .event-log tr td,
body.ttrss_prefs .event-log tr th {
vertical-align: top;
border-width: 0 0 1px 0;
border-style: solid;
border-color: #ddd;
}
body.ttrss_prefs .event-log tr .errno {
font-style: italic;

62
themes/light/prefs.less

@ -106,10 +106,16 @@ body.ttrss_prefs {
}
}
.users-list {
td {
cursor : pointer;
table {
th {
text-align : left;
}
td.checkbox {
text-align : center;
width : 32px;
}
}
ul.prefs-plugin-list {
@ -119,18 +125,22 @@ body.ttrss_prefs {
li {
display : flex;
align-items : center;
line-height : 30px;
border-bottom: @border-default 1px solid;
line-height : 16px;
&.text-center {
border : 0;
display : block;
}
> * {
padding : 4px;
padding : 8px;
}
label.checkbox {
display : flex;
align-items : center;
min-width : 200px;
margin-right : 16px;
cursor : pointer;
&.system {
@ -157,21 +167,45 @@ body.ttrss_prefs {
}
}
.plugin-installer-list {
.plugin-installed {
.plugin-installer-list, .plugin-updater-list {
li {
border-bottom: @border-default 1px solid;
> * {
padding : 8px 4px;
}
> pre {
margin : 0;
}
h3 {
margin : 0;
}
&.text-center {
border : 0;
}
}
.plugin-installed > * {
opacity : 0.5;
}
}
.users-list,
.event-log {
td, th {
cursor : pointer;
padding : 8px;
border-bottom: @border-default 1px solid;
}
}
.event-log {
tr {
td {
font-size: 10px;
padding : 8px;
td, th {
vertical-align : top;
border-width : 0 0 1px 0;
border-style : solid;
border-color : @border-default;
}
.errno {

54
themes/night.css

@ -1512,8 +1512,12 @@ body.ttrss_prefs fieldset.plugin label.description {
body.ttrss_prefs fieldset.plugin label.description .dijitCheckBox {
margin-right: 10px;
}
body.ttrss_prefs .users-list td {
cursor: pointer;
body.ttrss_prefs table th {
text-align: left;
}
body.ttrss_prefs table td.checkbox {
text-align: center;
width: 32px;
}
body.ttrss_prefs ul.prefs-plugin-list {
margin: 0;
@ -1522,17 +1526,20 @@ body.ttrss_prefs ul.prefs-plugin-list {
body.ttrss_prefs ul.prefs-plugin-list li {
display: flex;
align-items: center;
line-height: 30px;
border-bottom: #222 1px solid;
line-height: 16px;
}
body.ttrss_prefs ul.prefs-plugin-list li.text-center {
border: 0;
display: block;
}
body.ttrss_prefs ul.prefs-plugin-list li > * {
padding: 4px;
padding: 8px;
}
body.ttrss_prefs ul.prefs-plugin-list li label.checkbox {
display: flex;
align-items: center;
min-width: 200px;
margin-right: 16px;
cursor: pointer;
}
body.ttrss_prefs ul.prefs-plugin-list li label.checkbox.system {
@ -1552,16 +1559,41 @@ body.ttrss_prefs ul.prefs-plugin-list li .version {
min-width: 200px;
text-align: right;
}
body.ttrss_prefs .plugin-installer-list .plugin-installed {
body.ttrss_prefs .plugin-installer-list li,
body.ttrss_prefs .plugin-updater-list li {
border-bottom: #222 1px solid;
}
body.ttrss_prefs .plugin-installer-list li > *,
body.ttrss_prefs .plugin-updater-list li > * {
padding: 8px 4px;
}
body.ttrss_prefs .plugin-installer-list li > pre,
body.ttrss_prefs .plugin-updater-list li > pre {
margin: 0;
}
body.ttrss_prefs .plugin-installer-list li h3,
body.ttrss_prefs .plugin-updater-list li h3 {
margin: 0;
}
body.ttrss_prefs .plugin-installer-list li.text-center,
body.ttrss_prefs .plugin-updater-list li.text-center {
border: 0;
}
body.ttrss_prefs .plugin-installer-list .plugin-installed > *,
body.ttrss_prefs .plugin-updater-list .plugin-installed > * {
opacity: 0.5;
}
body.ttrss_prefs .event-log tr td {
font-size: 10px;
body.ttrss_prefs .users-list td,
body.ttrss_prefs .event-log td,
body.ttrss_prefs .users-list th,
body.ttrss_prefs .event-log th {
cursor: pointer;
padding: 8px;
border-bottom: #222 1px solid;
}
body.ttrss_prefs .event-log tr td,
body.ttrss_prefs .event-log tr th {
vertical-align: top;
border-width: 0 0 1px 0;
border-style: solid;
border-color: #222;
}
body.ttrss_prefs .event-log tr .errno {
font-style: italic;

54
themes/night_blue.css

@ -1512,8 +1512,12 @@ body.ttrss_prefs fieldset.plugin label.description {
body.ttrss_prefs fieldset.plugin label.description .dijitCheckBox {
margin-right: 10px;
}
body.ttrss_prefs .users-list td {
cursor: pointer;
body.ttrss_prefs table th {
text-align: left;
}
body.ttrss_prefs table td.checkbox {
text-align: center;
width: 32px;
}
body.ttrss_prefs ul.prefs-plugin-list {
margin: 0;
@ -1522,17 +1526,20 @@ body.ttrss_prefs ul.prefs-plugin-list {
body.ttrss_prefs ul.prefs-plugin-list li {
display: flex;
align-items: center;
line-height: 30px;
border-bottom: #222 1px solid;
line-height: 16px;
}
body.ttrss_prefs ul.prefs-plugin-list li.text-center {
border: 0;
display: block;
}
body.ttrss_prefs ul.prefs-plugin-list li > * {
padding: 4px;
padding: 8px;
}
body.ttrss_prefs ul.prefs-plugin-list li label.checkbox {
display: flex;
align-items: center;
min-width: 200px;
margin-right: 16px;
cursor: pointer;
}
body.ttrss_prefs ul.prefs-plugin-list li label.checkbox.system {
@ -1552,16 +1559,41 @@ body.ttrss_prefs ul.prefs-plugin-list li .version {
min-width: 200px;
text-align: right;
}
body.ttrss_prefs .plugin-installer-list .plugin-installed {
body.ttrss_prefs .plugin-installer-list li,
body.ttrss_prefs .plugin-updater-list li {
border-bottom: #222 1px solid;
}
body.ttrss_prefs .plugin-installer-list li > *,
body.ttrss_prefs .plugin-updater-list li > * {
padding: 8px 4px;
}
body.ttrss_prefs .plugin-installer-list li > pre,
body.ttrss_prefs .plugin-updater-list li > pre {
margin: 0;
}
body.ttrss_prefs .plugin-installer-list li h3,
body.ttrss_prefs .plugin-updater-list li h3 {
margin: 0;
}
body.ttrss_prefs .plugin-installer-list li.text-center,
body.ttrss_prefs .plugin-updater-list li.text-center {
border: 0;
}
body.ttrss_prefs .plugin-installer-list .plugin-installed > *,
body.ttrss_prefs .plugin-updater-list .plugin-installed > * {
opacity: 0.5;
}
body.ttrss_prefs .event-log tr td {
font-size: 10px;
body.ttrss_prefs .users-list td,
body.ttrss_prefs .event-log td,
body.ttrss_prefs .users-list th,
body.ttrss_prefs .event-log th {
cursor: pointer;
padding: 8px;
border-bottom: #222 1px solid;
}
body.ttrss_prefs .event-log tr td,
body.ttrss_prefs .event-log tr th {
vertical-align: top;
border-width: 0 0 1px 0;
border-style: solid;
border-color: #222;
}
body.ttrss_prefs .event-log tr .errno {
font-style: italic;

Loading…
Cancel
Save