diff options
Diffstat (limited to 'tt-rss.php')
| -rw-r--r-- | tt-rss.php | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/tt-rss.php b/tt-rss.php index 53e8036f6..80419a0c6 100644 --- a/tt-rss.php +++ b/tt-rss.php @@ -29,6 +29,7 @@ <link rel="stylesheet" type="text/css" href="cdm.css?<?php echo $dt_add ?>"/> <link rel="stylesheet" type="text/css" href="lib/modalbox/modalbox.css"/> + <link rel="stylesheet" type="text/css" href="lib/dijit/themes/claro/claro.css"/> <?php $user_theme = get_user_theme_path($link); if ($user_theme) { ?> @@ -44,7 +45,8 @@ <script type="text/javascript" src="lib/prototype.js"></script> <script type="text/javascript" src="lib/scriptaculous/scriptaculous.js?load=effects,dragdrop,controls,builder"></script> - <script type="text/javascript" src="lib/modalbox/modalbox.js"></script> + <script type="text/javascript" src="lib/modalbox/modalbox.js"></script> + <script type="text/javascript" src="lib/dojo/dojo.js" djConfig="parseOnLoad: true"></script> <script type="text/javascript" charset="utf-8" src="localized_js.php?<?php echo $dt_add ?>"></script> <script type="text/javascript" charset="utf-8" src="tt-rss.js?<?php echo $dt_add ?>"></script> <script type="text/javascript" charset="utf-8" src="functions.js?<?php echo $dt_add ?>"></script> @@ -60,7 +62,7 @@ </script> </head> -<body id="ttrssMain"> +<body id="ttrssMain" class="claro"> <div id="overlay" style="display : block"> <div id="overlay_inner"> @@ -89,7 +91,9 @@ <div id="cmdline" style="display : none"></div> <div id="auxDlg" style="display : none"></div> -<div id="header"> +<div id="main" dojoType="dijit.layout.BorderContainer"> + +<div id="header" dojoType="dijit.layout.ContentPane" region="top"> <div class="topLinks" id="topLinks"> <?php if (!SINGLE_USER_MODE) { ?> @@ -117,7 +121,7 @@ <img src="<?php echo theme_image($link, 'images/ttrss_logo.png') ?>" alt="Tiny Tiny RSS"/> </div> -<div id="feeds-holder"> +<div id="feeds-holder" dojoType="dijit.layout.ContentPane" region="leading" style="width : 20%" splitter="true"> <div id="dispSwitch"> <a id="dispSwitchPrompt" href="javascript:toggleTags()"><?php echo __("tag cloud") ?></a> @@ -125,7 +129,9 @@ <div id="feeds-frame"> </div> </div> -<div id="toolbar"> +<div dojoType="dijit.layout.BorderContainer" region="center"> + +<div id="toolbar" dojoType="dijit.layout.ContentPane" region="top"> <div class="actionChooser"> <select id="quickMenuChooser" onchange="quickMenuChange()"> @@ -194,25 +200,17 @@ </div> <?php if (!get_pref($link, 'COMBINED_DISPLAY_MODE')) { ?> - <div id="headlines-frame" class="headlines_normal"> + <div id="headlines-frame" class="headlines_normal" dojoType="dijit.layout.ContentPane" region="center"> <div class="whiteBox"><?php echo __('Loading, please wait...') ?></div></div> - <div id="content-frame"> - <div id="resize-grabber" - onmouseover="enable_resize(true)" onmouseout="enable_resize(false)" - title="<?php echo __('Drag me to resize panels') ?>"> - <img src="<?php echo theme_image($link, - 'images/resize_handle_horiz.png') ?>" id="resize-handle" - onmouseover="enable_resize(true)" onmouseout="enable_resize(false)" - alt=""/> - </div> - <div id="content-insert"> </div> - <!-- <div class="whiteBox"> </div> --> </div> + <div id="content-insert" dojoType="dijit.layout.ContentPane" region="bottom" style="height : 50%" splitter="true"></div> <?php } else { ?> - <div id="headlines-frame" class="headlines_cdm"> + <div id="headlines-frame" class="headlines_cdm" dojoType="dijit.layout.ContentPane" region="center"> <div class="whiteBox"><?php echo __('Loading, please wait...') ?></div></div> <?php } ?> -<div id="footer"> +</div> + +<div id="footer" dojoType="dijit.layout.ContentPane" region="bottom"> <a href="http://tt-rss.org/">Tiny Tiny RSS</a> <?php if (!defined('HIDE_VERSION')) { ?> v<?php echo VERSION ?> @@ -220,6 +218,8 @@ © 2005–<?php echo date('Y') ?> <a href="http://fakecake.org/">Andrew Dolgov</a> </div> +</div> + <?php db_close($link); ?> </body> |