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

more button styles work

This commit is contained in:
Andrew Dolgov 2010-01-12 15:56:29 +03:00
parent ad491d75a6
commit 577399e829
6 changed files with 82 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
modules/pref-feeds.php
View File

@ -69,11 +69,6 @@
if ($subop == "browse") { if ($subop == "browse") {
if (!ENABLE_FEED_BROWSER) {
print __("Feed browser is administratively disabled.");
return;
}
print "<div id=\"infoBoxTitle\">".__('Feed Browser')."</div>"; print "<div id=\"infoBoxTitle\">".__('Feed Browser')."</div>";
print "<div class=\"infoBoxContents\">"; print "<div class=\"infoBoxContents\">";
@ -89,11 +84,8 @@
<img style='display : none' <img style='display : none'
id='feed_browser_spinner' src='images/indicator_white.gif'> id='feed_browser_spinner' src='images/indicator_white.gif'>
<input name=\"search\" size=\"20\" type=\"search\" <input name=\"search\" size=\"20\" type=\"search\"
onfocus=\"javascript:disableHotkeys();\" onchange=\"javascript:updateFeedBrowser()\" value=\"$browser_search\">
onblur=\"javascript:enableHotkeys();\" <button onclick=\"javascript:updateFeedBrowser()\">".__('Search')."</button>
onchange=\"javascript:updateFeedBrowser()\" value=\"$browser_search\">
<input type=\"submit\" class=\"button\"
onclick=\"javascript:updateFeedBrowser()\" value=\"".__('Search')."\">
</div>"; </div>";
print " <select name=\"mode\" onchange=\"updateFeedBrowser()\"> print " <select name=\"mode\" onchange=\"updateFeedBrowser()\">
@ -103,7 +95,7 @@
print __("limit:"); print __("limit:");
print " <select name=\"limit\">"; print " <select name=\"limit\" onchange='updateFeedBrowser()'>";
foreach (array(25, 50, 100, 200) as $l) { foreach (array(25, 50, 100, 200) as $l) {
$issel = ($l == $limit) ? "selected" : ""; $issel = ($l == $limit) ? "selected" : "";
@ -112,10 +104,6 @@
print "</select> "; print "</select> ";
print "
<input type=\"submit\" class=\"button\"
onclick=\"updateFeedBrowser()\" value=\"".__('Show')."\">";
print "<p>"; print "<p>";
$owner_uid = $_SESSION["uid"]; $owner_uid = $_SESSION["uid"];
@ -1117,33 +1105,29 @@
$feed_search = $_SESSION["prefs_feed_search"]; $feed_search = $_SESSION["prefs_feed_search"];
} }
print "<div class=\"feedEditSearch\"> print "<div style='float : right'>
<input id=\"feed_search\" size=\"20\" type=\"search\" <input id=\"feed_search\" size=\"20\" type=\"search\"
onfocus=\"javascript:disableHotkeys();\" onfocus=\"javascript:disableHotkeys();\"
onblur=\"javascript:enableHotkeys();\" onblur=\"javascript:enableHotkeys();\"
onchange=\"javascript:updateFeedList()\" value=\"$feed_search\"> onchange=\"javascript:updateFeedList()\" value=\"$feed_search\">
<input type=\"submit\" class=\"button\" <button onclick=\"javascript:updateFeedList()\">".
onclick=\"javascript:updateFeedList()\" value=\"".__('Search')."\"> __('Search')."</button>
</div>"; </div>";
print "<input onclick=\"javascript:displayDlg('quickAddFeed')\" print "<button onclick=\"javascript:displayDlg('quickAddFeed')\">"
type=\"submit\" .__('Subscribe to feed')."</button> ";
class=\"button\" value=\"".__('Subscribe to feed')."\"> ";
print "<input onclick=\"javascript:editSelectedFeed()\" print "<button onclick=\"javascript:editSelectedFeed()\">".
type=\"submit\" __('Edit feeds')."</button> ";
class=\"button\" value=\"".__('Edit feeds')."\"> ";
if (get_pref($link, 'ENABLE_FEED_CATS')) { if (get_pref($link, 'ENABLE_FEED_CATS')) {
print "<input onclick=\"javascript:editFeedCats()\" print "<button onclick=\"javascript:editFeedCats()\">".
type=\"submit\" __('Edit categories')."</button> ";
class=\"button\" value=\"".__('Edit categories')."\"> ";
} }
print "<input onclick=\"javascript:removeSelectedFeeds()\" print "<button onclick=\"javascript:removeSelectedFeeds()\">"
type=\"submit\" .__('Unsubscribe')."</button> ";
class=\"button\" value=\"".__('Unsubscribe')."\"> ";
/* print "<select id=\"feedActionChooser\" onchange=\"feedActionChange()\"> /* print "<select id=\"feedActionChooser\" onchange=\"feedActionChange()\">
<option value=\"facDefault\" selected>".__('Other actions...')."</option>"; <option value=\"facDefault\" selected>".__('Other actions...')."</option>";
@ -1421,15 +1405,14 @@
<form enctype=\"multipart/form-data\" method=\"POST\" action=\"opml.php\"> <form enctype=\"multipart/form-data\" method=\"POST\" action=\"opml.php\">
".__('File:')." <input id=\"opml_file\" name=\"opml_file\" type=\"file\">&nbsp; ".__('File:')." <input id=\"opml_file\" name=\"opml_file\" type=\"file\">&nbsp;
<input type=\"hidden\" name=\"op\" value=\"Import\"> <input type=\"hidden\" name=\"op\" value=\"Import\">
<input class=\"button\" onclick=\"return validateOpmlImport();\" <button onclick=\"return validateOpmlImport();\"
type=\"submit\" value=\"".__('Import')."\"> type=\"submit\">".__('Import')."</button>
</form></div>"; </form></div>";
print "&nbsp;"; print "&nbsp;";
print "<input type=\"submit\" print "<button onclick=\"gotoExportOpml()\">".
class=\"button\" onclick=\"gotoExportOpml()\" __('Export OPML')."</button>";
value=\"".__('Export OPML')."\">";
print "<h3>" . __("Firefox Integration") . "</h3>"; print "<h3>" . __("Firefox Integration") . "</h3>";
@ -1453,11 +1436,8 @@
print "<p><a class=\"visibleLinkB\" id=\"pubGenAddress\" target=\"_blank\" href=\"$url_path\">".__("Link to published articles feed.")."</a></p>"; print "<p><a class=\"visibleLinkB\" id=\"pubGenAddress\" target=\"_blank\" href=\"$url_path\">".__("Link to published articles feed.")."</a></p>";
print "<p><input type=\"submit\" onclick=\"return pubRegenKey()\" class=\"button\" print "<button onclick=\"return pubRegenKey()\">".
value=\"".__('Generate another link')."\">"; __('Generate another link')."</button>";
/* print " <input type=\"submit\" onclick=\"return pubToClipboard()\" class=\"button\"
value=\"".__('Copy link to clipboard')."\">"; */
print "</p>";
} }

47
modules/pref-filters.php
View File

@ -60,8 +60,6 @@
print "&nbsp;</span>"; print "&nbsp;</span>";
print "<input onkeypress=\"return filterCR(event, filterEditSave)\" print "<input onkeypress=\"return filterCR(event, filterEditSave)\"
onkeyup=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
onchange=\"toggleSubmitNotEmpty(this, 'infobox_submit')\"
name=\"reg_exp\" size=\"30\" value=\"$reg_exp\">"; name=\"reg_exp\" size=\"30\" value=\"$reg_exp\">";
print "<span id=\"filter_dlg_date_chk_box\" $date_ops_invisible>"; print "<span id=\"filter_dlg_date_chk_box\" $date_ops_invisible>";
@ -151,19 +149,15 @@
$reg_exp = htmlspecialchars($reg_exp, ENT_QUOTES); // second escaping seems to be needed for javascript $reg_exp = htmlspecialchars($reg_exp, ENT_QUOTES); // second escaping seems to be needed for javascript
print "<div style=\"float : left\">"; print "<div style=\"float : left\">";
print "<input type=\"submit\" print "<button onclick='return removeFilter($filter_id, \"$reg_exp\")'>".
class=\"button\" onclick='return removeFilter($filter_id, \"$reg_exp\")' __('Remove')."</button>";
value=\"".__('Remove')."\"> ";
print "</div>"; print "</div>";
print "<input type=\"submit\" print "<button onclick=\"return filterEditSave()\">".
id=\"infobox_submit\" __('Save')."</button> ";
class=\"button\" onclick=\"return filterEditSave()\"
value=\"".__('Save')."\"> ";
print "<input class=\"button\" print "<button onclick=\"return filterEditCancel()\">".
type=\"submit\" onclick=\"return filterEditCancel()\" __('Cancel')."</button>";
value=\"".__('Cancel')."\">";
print "</div>"; print "</div>";
@ -298,35 +292,28 @@
$filter_search = $_SESSION["prefs_filter_search"]; $filter_search = $_SESSION["prefs_filter_search"];
} }
print "<div class=\"feedEditSearch\"> print "<div style='float : right'>
<input id=\"filter_search\" size=\"20\" type=\"search\" <input id=\"filter_search\" size=\"20\" type=\"search\"
onfocus=\"javascript:disableHotkeys();\" onfocus=\"javascript:disableHotkeys();\"
onblur=\"javascript:enableHotkeys();\" onblur=\"javascript:enableHotkeys();\"
onchange=\"javascript:updateFilterList()\" value=\"$filter_search\"> onchange=\"javascript:updateFilterList()\" value=\"$filter_search\">
<input type=\"submit\" class=\"button\" <button onclick=\"javascript:updateFilterList()\">".__('Search')."</button>
onclick=\"javascript:updateFilterList()\" value=\"".__('Search')."\">
&nbsp; &nbsp;
<a class='helpLinkPic' href=\"javascript:displayHelpInfobox(2)\"> <a class='helpLinkPic' href=\"javascript:displayHelpInfobox(2)\">
<img src='images/sign_quest.gif'></a> <img src='images/sign_quest.gif'></a>
</div>"; </div>";
print "<button onclick=\"return displayDlg('quickAddFilter', false)\">".
__('Create filter')."</button> ";
print "<input type=\"submit\" print "<button onclick=\"return editSelectedFilter()\">".
class=\"button\" __('Edit')."</button> ";
onclick=\"return displayDlg('quickAddFilter', false)\"
value=\"".__('Create filter')."\"> ";
print "<input type=\"submit\" class=\"button\" print "<button onclick=\"return removeSelectedFilters()\">".
onclick=\"return editSelectedFilter()\" value=\"".__('Edit')."\"> "; __('Remove')."</button> ";
print "<input type=\"submit\" class=\"button\"
onclick=\"return removeSelectedFilters()\" value=\"".__('Remove')."\"> ";
print "<input type=\"submit\"
class=\"button\"
onclick=\"rescore_all_feeds()\"
value=\"".__('Rescore articles')."\"> ";
print "<button onclick=\"rescore_all_feeds()\">".
__('Rescore articles')."</button> ";
if ($filter_search) { if ($filter_search) {
$filter_search = split(' ', db_escape_string($filter_search)); $filter_search = split(' ', db_escape_string($filter_search));

23
modules/pref-labels.php
View File

@ -123,31 +123,24 @@
$label_search = $_SESSION["prefs_label_search"]; $label_search = $_SESSION["prefs_label_search"];
} }
print "<div class=\"feedEditSearch\"> print "<div style='float : right'>
<input id=\"label_search\" size=\"20\" type=\"search\" <input id=\"label_search\" size=\"20\" type=\"search\"
onfocus=\"javascript:disableHotkeys();\" onfocus=\"javascript:disableHotkeys();\"
onblur=\"javascript:enableHotkeys();\" onblur=\"javascript:enableHotkeys();\"
onchange=\"javascript:updateLabelList()\" value=\"$label_search\"> onchange=\"javascript:updateLabelList()\" value=\"$label_search\">
<input type=\"submit\" class=\"button\" <button onclick=\"javascript:updateLabelList()\">".__('Search')."</button>
onclick=\"javascript:updateLabelList()\" value=\"".__('Search')."\">
</div>"; </div>";
print "<div class=\"prefGenericAddBox\">"; print "<div class=\"prefGenericAddBox\">";
print"<input type=\"submit\" class=\"button\" print"<button onclick=\"return addLabel()\">".
onclick=\"return addLabel()\" __('Create label')."</button> ";
value=\"".__('Create label')."\"> ";
print "<input type=\"submit\" class=\"button\" print "<button onclick=\"javascript:removeSelectedLabels()\">".
onclick=\"javascript:removeSelectedLabels()\" value=\"".__('Remove')."\">"; __('Remove')."</button> ";
print "&nbsp;"; print "<button onclick=\"labelColorReset()\">".
/* print "&nbsp;<input type=\"submit\" class=\"button\" disabled=\"true\" __('Clear colors')."</button>";
onclick=\"labelColorSet('fg')\" value=\"".__('Fg')."\">&nbsp;";
print "<input type=\"submit\" class=\"button\" disabled=\"true\"
onclick=\"labelColorSet('bg')\" value=\"".__('Bg')."\">&nbsp;"; */
print "<input type=\"submit\" class=\"button\"
onclick=\"labelColorReset()\" value=\"".__('Clear colors')."\">";
print "</div>"; print "</div>";

22
modules/pref-prefs.php
View File

@ -228,8 +228,8 @@
print "</form>"; print "</form>";
print "<p><input class=\"button\" type=\"submit\" print "<p><button onclick=\"return changeUserEmail()\">".
onclick=\"return changeUserEmail()\" value=\"".__("Change e-mail")."\">"; __("Change e-mail")."</button>";
print "<form onsubmit=\"return false\" print "<form onsubmit=\"return false\"
name=\"change_pass_form\" id=\"change_pass_form\">"; name=\"change_pass_form\" id=\"change_pass_form\">";
@ -267,9 +267,8 @@
print "</form>"; print "</form>";
print "<p><input class=\"button\" type=\"submit\" print "<p><button onclick=\"return changeUserPassword()\">".
onclick=\"return changeUserPassword()\" __("Change password")."</button>";
value=\"".__("Change password")."\">";
} }
@ -303,8 +302,7 @@
print "</table>"; print "</table>";
print "<input type=\"hidden\" name=\"op\" value=\"pref-prefs\">"; print "<input type=\"hidden\" name=\"op\" value=\"pref-prefs\">";
print "<input type=\"hidden\" name=\"subop\" value=\"change-theme\">"; print "<input type=\"hidden\" name=\"subop\" value=\"change-theme\">";
print "<p><input class=\"button\" type=\"submit\" print "<p><button>".__('Change theme')."</button>";
value=\"".__('Change theme')."\">";
print "</form>"; print "</form>";
} }
@ -398,13 +396,11 @@
print "<input type=\"hidden\" name=\"op\" value=\"pref-prefs\">"; print "<input type=\"hidden\" name=\"op\" value=\"pref-prefs\">";
print "<p><input class=\"button\" type=\"submit\" print "<p><button onclick=\"return validatePrefsSave()\">".
onclick=\"return validatePrefsSave()\" __('Save configuration')."</button> ";
value=\"".__('Save configuration')."\">";
print "&nbsp;<input class=\"button\" type=\"submit\" print "<button onclick=\"return validatePrefsReset()\">".
onclick=\"return validatePrefsReset()\" __('Reset to defaults')."</button></p>";
value=\"".__('Reset to defaults')."\"></p>";
print "</form>"; print "</form>";

41
modules/pref-users.php
View File

@ -93,8 +93,8 @@
print "</ul>"; print "</ul>";
print "<div align='center'> print "<div align='center'>
<input type='submit' class='button' <button onclick=\"closeInfoBox()\">".__("Close this window").
onclick=\"closeInfoBox()\" value=\"Close this window\"></div>"; "</button></div>";
print "</div>"; print "</div>";
@ -175,12 +175,10 @@
print "</form>"; print "</form>";
print "<div class=\"dlgButtons\"> print "<div class=\"dlgButtons\">
<input class=\"button\" <button onclick=\"return userEditSave()\">".
type=\"submit\" onclick=\"return userEditSave()\" __('Save')."</button>
value=\"".__('Save')."\"> <button onclick=\"return userEditCancel()\">".
<input class=\"button\" __('Cancel')."</button></div>";
type=\"submit\" onclick=\"return userEditCancel()\"
value=\"".__('Cancel')."\"></div>";
print "</div>"; print "</div>";
@ -354,13 +352,13 @@
$user_search = $_SESSION["prefs_user_search"]; $user_search = $_SESSION["prefs_user_search"];
} }
print "<div class=\"feedEditSearch\"> print "<div style='float : right'>
<input id=\"user_search\" size=\"20\" type=\"search\" <input id=\"user_search\" size=\"20\" type=\"search\"
onfocus=\"javascript:disableHotkeys();\" onfocus=\"javascript:disableHotkeys();\"
onblur=\"javascript:enableHotkeys();\" onblur=\"javascript:enableHotkeys();\"
onchange=\"javascript:updateUsersList()\" value=\"$user_search\"> onchange=\"javascript:updateUsersList()\" value=\"$user_search\">
<input type=\"submit\" class=\"button\" <button onclick=\"javascript:updateUsersList()\">".
onclick=\"javascript:updateUsersList()\" value=\"".__('Search')."\"> __('Search')."</button>
</div>"; </div>";
$sort = db_escape_string($_REQUEST["sort"]); $sort = db_escape_string($_REQUEST["sort"]);
@ -369,18 +367,17 @@
$sort = "login"; $sort = "login";
} }
print "<input type=\"submit\" class=\"button\" print "<button onclick=\"javascript:addUser()\">".__('Create user')."</button>";
onclick=\"javascript:addUser()\" value=\"".__('Create user')."\">";
print " print "
<input type=\"submit\" class=\"button\" <button onclick=\"javascript:selectedUserDetails()\">".
onclick=\"javascript:selectedUserDetails()\" value=\"".__('Details')."\"> __('Details')."</button>
<input type=\"submit\" class=\"button\" <button onclick=\"javascript:editSelectedUser()\">".
onclick=\"javascript:editSelectedUser()\" value=\"".__('Edit')."\"> __('Edit')."</button>
<input type=\"submit\" class=\"button\" <button onclick=\"javascript:removeSelectedUsers()\">".
onclick=\"javascript:removeSelectedUsers()\" value=\"".__('Remove')."\"> __('Remove')."</button>
<input type=\"submit\" class=\"button\" <button onclick=\"javascript:resetSelectedUserPass()\">".
onclick=\"javascript:resetSelectedUserPass()\" value=\"".__('Reset password')."\">"; __('Reset password')."</button>";
print "</div>"; print "</div>";

15
tt-rss.css
View File

@ -487,10 +487,6 @@ tr.title td a:hover {
color : black; color : black;
} }
div.feedEditSearch {
float : right;
}
table.prefFeedList td.feedEditCat { table.prefFeedList td.feedEditCat {
font-weight : bold; font-weight : bold;
border-width : 0px 0px 1px 0px; border-width : 0px 0px 1px 0px;
@ -2270,8 +2266,8 @@ button, select {
font-size : 100%; font-size : 100%;
/* line-height : 120%; */ /* line-height : 120%; */
text-decoration : none; text-decoration : none;
font-weight : bold; /* font-weight : bold; */
color : #565656; color : #303030;
cursor : pointer; cursor : pointer;
padding : 1px 3px 1px 3px; padding : 1px 3px 1px 3px;
} }
@ -2281,6 +2277,13 @@ select {
padding : 1px 0px 1px 3px; padding : 1px 0px 1px 3px;
} }
input {
background : white;
border : 1px solid #bebebe;
font-size : 100%;
padding : 1px 3px 1px 3px;
}
button:hover { button:hover {
background-color : #f9faff; background-color : #f9faff;
border : 1px solid #88b0f0; border : 1px solid #88b0f0;