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

about dialog, UI tweaks

This commit is contained in:
Andrew Dolgov 2011-04-18 16:29:10 +04:00
parent ff9e70af47
commit da497babda
5 changed files with 63 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
modules/popup-dialog.php
View File

@ -954,6 +954,36 @@
} }
if ($id == "about") {
print "<table width='100%'><tr><td align='center'>";
print "<img src=\"images/logo_big.png\">";
print "</td>";
print "<td width='70%'>";
print "<h1>Tiny Riny RSS</h1>
<strong>Version ".VERSION."</strong>
<p>Copyright &copy; 2005-".date('Y')."
<a target=\"_blank\" class=\"visibleLink\"
href=\"http://fakecake.org/\">Andrew Dolgov</a>
and other contributors.</p>
<p class=\"insensitive\">Licensed under GNU GPL version 2.</p>";
print "<p class=\"insensitive\">
<a class=\"visibleLink\" target=\"_blank\"
href=\"http://tt-rss.org/\">Official site</a> &mdash;
<a href=\"http://tt-rss.org/redmine/wiki/tt-rss/Donate\"
target=\"_blank\" class=\"visibleLink\">
Support the project.</a></p>";
print "</td></tr>";
print "</table>";
print "<div align='center'>";
print "<button dojoType=\"dijit.form.Button\"
type=\"submit\">".
__('Close this window')."</button>";
print "</div>";
}
print "</dlg>"; print "</dlg>";
} }

53
prefs.php
View File

@ -1,12 +1,12 @@
<?php <?php
require_once "functions.php"; require_once "functions.php";
require_once "sessions.php"; require_once "sessions.php";
require_once "sanity_check.php"; require_once "sanity_check.php";
require_once "version.php"; require_once "version.php";
require_once "config.php"; require_once "config.php";
require_once "db-prefs.php"; require_once "db-prefs.php";
$link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME); $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
init_connection($link); init_connection($link);
@ -15,11 +15,11 @@
$dt_add = time(); $dt_add = time();
no_cache_incantation(); no_cache_incantation();
header('Content-Type: text/html; charset=utf-8'); header('Content-Type: text/html; charset=utf-8');
?> ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html> <html>
<head> <head>
@ -29,7 +29,7 @@
<?php print_theme_includes($link) ?> <?php print_theme_includes($link) ?>
<?php print_user_stylesheet($link) ?> <?php print_user_stylesheet($link) ?>
<link rel="shortcut icon" type="image/png" href="images/favicon.png"/> <link rel="shortcut icon" type="image/png" href="images/favicon.png"/>
<script type="text/javascript" src="lib/prototype.js"></script> <script type="text/javascript" src="lib/prototype.js"></script>
@ -47,7 +47,7 @@
<script type="text/javascript" charset="utf-8" src="prefs.js?<?php echo $dt_add ?>"></script> <script type="text/javascript" charset="utf-8" src="prefs.js?<?php echo $dt_add ?>"></script>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<script type="text/javascript"> <script type="text/javascript">
Event.observe(window, 'load', function() { Event.observe(window, 'load', function() {
init(); init();
@ -69,7 +69,7 @@
</div> </div>
<noscript><br/><?php print_error('Javascript is disabled. Please enable it.') ?></noscript> <noscript><br/><?php print_error('Javascript is disabled. Please enable it.') ?></noscript>
</div> </div>
</div> </div>
<div id="hotkey_help_overlay" style="display : none" onclick="Element.hide(this)"> <div id="hotkey_help_overlay" style="display : none" onclick="Element.hide(this)">
<?php rounded_table_start("hho"); ?> <?php rounded_table_start("hho"); ?>
@ -79,47 +79,38 @@
<img id="piggie" src="images/piggie.png" style="display : none" alt="piggie"/> <img id="piggie" src="images/piggie.png" style="display : none" alt="piggie"/>
<div id="main" dojoType="dijit.layout.BorderContainer">
<div id="header" dojoType="dijit.layout.ContentPane" region="top"> <div id="header" dojoType="dijit.layout.ContentPane" region="top">
<img style="float : left" src="<?php echo theme_image($link, 'images/logo_wide.png') ?>" title="Tiny Tiny RSS"/> <a href='#' onclick="Effect.Appear('hotkey_help_overlay', {duration: 0.3})"><?php echo __("Keyboard shortcuts") ?></a> |
<a href="#" onclick="gotoMain()"><?php echo __('Exit preferences') ?></a>
<?php if (!SINGLE_USER_MODE) { ?>
<?php echo __('Hello,') ?> <b><?php echo $_SESSION["name"] ?></b> |
<?php } ?>
<a href="#" onclick="gotoMain()"><?php echo __('Exit preferences') ?></a> |
<a href='#' onclick="Effect.Appear('hotkey_help_overlay', {duration: 0.3})"><?php echo __("Keyboard shortcuts") ?></a>
<?php if (!SINGLE_USER_MODE) { ?>
| <a href="logout.php"><?php echo __('Logout') ?></a>
<?php } ?>
</div> </div>
<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>
<?php } ?> <?php } ?>
</div> </div>
<div id="footer" dojoType="dijit.layout.ContentPane" region="bottom"> <div id="footer" dojoType="dijit.layout.ContentPane" region="bottom">
<a href="http://tt-rss.org/">Tiny Tiny RSS</a> <a class="insensitive" target="_blank" href="http://tt-rss.org/">
<?php if (!defined('HIDE_VERSION')) { ?> Tiny Tiny RSS</a> &copy; 2005-<?php echo date('Y') ?>
v<?php echo VERSION ?> <a class="insensitive" target="_blank"
<?php } ?> href="http://fakecake.org/">Andrew Dolgov</a>
&copy; 2005&ndash;<?php echo date('Y') ?> <a href="http://fakecake.org/">Andrew Dolgov</a>
</div> <!-- footer --> </div> <!-- footer -->
</div> </div>

58
tt-rss.css
View File

@ -434,59 +434,6 @@ a.helpLink:hover {
font-size : 12px; font-size : 12px;
} }
/*
div.firstTab {
width : 10px;
float : left;
}
div.prefsTab:hover {
cursor : pointer;
}
div.prefsTab.Selected:hover {
cursor : pointer;
}
div.prefsTab {
float : left;
border-width : 1px 1px 0px 1px;
border-color : #C4D1E4;
border-style : solid;
margin : 0px 0px 0px 5px;
padding : 3px 5px 3px 5px;
font-size : 12px;
font-family : "Lucida Grande", "Segoe UI", Tahoma, Arial, sans-serif;
border-collapse : collapse;
min-width : 100px;
text-align : center;
cursor : pointer;
position : relative;
bottom : -1px;
height : 30px;
}
div.prefsTab.Selected {
float : left;
border-width : 1px 1px 0px 1px;
border-color : #88b0f0;
border-style : solid;
margin : 0px 0px 0px 5px;
padding : 3px 5px 3px 5px;
background-color : #ecf4ff;
font-size : 12px;
font-family : "Lucida Grande", "Segoe UI", Tahoma, Arial, sans-serif;
border-collapse : collapse;
font-weight : bold;
min-width : 100px;
text-align : center;
cursor : pointer;
position : relative;
bottom : -1px;
z-index : 3;
height : 30px;
} */
div.notice { div.notice {
background : #ffffff; background : #ffffff;
border : 1px solid #88b0f0; border : 1px solid #88b0f0;
@ -1467,11 +1414,6 @@ div.fatalError textarea {
border-width : 0px; border-width : 0px;
} }
/* #content-tabs .dijitTab {
margin-top : 0px;
padding-top : 0px;
} */
#toolbar { #toolbar {
padding : 0px; padding : 0px;
margin : 0px; margin : 0px;

10
tt-rss.js
View File

@ -427,6 +427,16 @@ function quickMenuGo(opid) {
Effect.Appear("hotkey_help_overlay", {duration : 0.3}); Effect.Appear("hotkey_help_overlay", {duration : 0.3});
} }
if (opid == "qmcAbout") {
dialog = new dijit.Dialog({
title: __("About..."),
style: "width: 400px",
href: "backend.php?op=dlg&id=about",
});
dialog.show();
}
} catch (e) { } catch (e) {
exception_error("quickMenuGo", e); exception_error("quickMenuGo", e);
} }

3
tt-rss.php
View File

@ -110,8 +110,6 @@
</div> </div>
<div dojoType="dijit.layout.BorderContainer" region="center" id="header-wrap" gutters="false"> <div dojoType="dijit.layout.BorderContainer" region="center" id="header-wrap" gutters="false">
<!-- <div dojoType="dijit.layout.ContentPane" region="top">
</div> -->
<div dojoType="dijit.layout.TabContainer" region="center" id="content-tabs"> <div dojoType="dijit.layout.TabContainer" region="center" id="content-tabs">
<div dojoType="dijit.layout.BorderContainer" region="center" id="content-wrap" <div dojoType="dijit.layout.BorderContainer" region="center" id="content-wrap"
title="<?php echo __("News") ?>"> title="<?php echo __("News") ?>">
@ -176,6 +174,7 @@
<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcAddLabel')"><?php echo __('Create label...') ?></div> <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcAddLabel')"><?php echo __('Create label...') ?></div>
<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcAddFilter')"><?php echo __('Create filter...') ?></div> <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcAddFilter')"><?php echo __('Create filter...') ?></div>
<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcHKhelp')"><?php echo __('Keyboard shortcuts help') ?></div> <div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcHKhelp')"><?php echo __('Keyboard shortcuts help') ?></div>
<div dojoType="dijit.MenuItem" onclick="quickMenuGo('qmcAbout')"><?php echo __('About...') ?></div>
</div> </div>
</div> </div>
</div> </div>