From: <tue...@us...> - 2008-06-17 21:50:09
|
Revision: 1678 http://azsmrc.svn.sourceforge.net/azsmrc/?rev=1678&view=rev Author: tuebernickel Date: 2008-06-17 14:50:07 -0700 (Tue, 17 Jun 2008) Log Message: ----------- major changes * introducing jquery to AzSMRC webUI * new toolbar using jquery * new GFX pack, changed to crystalClear package torrentControl with gfx toolbar with complete gfx * deleted old skin and its gfx pack minor changes * stylesheet updates odd/even table rows for download/upload table (for later usage) * fileupload options within fieldset * applied basic function for status changes * version display differs between Vuze and Azureus versions fixes * fixed dragbar * fixed stylesheet for different browsers and browserversions inactive/uncomplete/in progress * maximize tab * make windows compatible to viewport (height, width) * comfortable interaction menu Modified Paths: -------------- trunk/azsmrc/lbms/azsmrc/plugin/web/resources/ajaxWebUI.htm trunk/azsmrc/lbms/azsmrc/plugin/web/resources/css/azsmrc_skin2.css trunk/azsmrc/lbms/azsmrc/plugin/web/resources/js/azsmrc_main.js trunk/azsmrc/lbms/azsmrc/plugin/web/resources/js/contextMenu.js trunk/azsmrc/lbms/azsmrc/plugin/web/resources/js/fileUpload.js trunk/azsmrc/lbms/azsmrc/plugin/web/resources/js/handleRequests.js trunk/azsmrc/lbms/azsmrc/plugin/web/resources/js/tabControl.js Added Paths: ----------- trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/crystalClear/ trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/crystalClear/bottom.png trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/crystalClear/close.png trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/crystalClear/configure.png trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/crystalClear/console.mng trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/crystalClear/console.png trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/crystalClear/down.png trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/crystalClear/fileimport.png trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/crystalClear/info.png trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/crystalClear/pause.png trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/crystalClear/reload.png trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/crystalClear/resume.png trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/crystalClear/top.png trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/crystalClear/torrentControl/ trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/crystalClear/torrentControl/delete.png trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/crystalClear/torrentControl/force_start.png trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/crystalClear/torrentControl/start.png trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/crystalClear/torrentControl/stop.png trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/crystalClear/trash.png trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/crystalClear/up.png trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/crystalClear/users.png trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/skin2/toolbar.png trunk/azsmrc/lbms/azsmrc/plugin/web/resources/js/jquery/ trunk/azsmrc/lbms/azsmrc/plugin/web/resources/js/jquery/azsmrc.js trunk/azsmrc/lbms/azsmrc/plugin/web/resources/js/jquery/jquery-1.2.5.min.js Removed Paths: ------------- trunk/azsmrc/lbms/azsmrc/plugin/web/resources/css/azsmrc_default.css trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/bottom.png trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/connect.png trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/connect_new.png trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/connect_quick_new.png trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/console.png trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/delete.png trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/down.png trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/down_arrow.gif trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/edit_add.png trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/firefrog_icon.png trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/gg_connecting.gif trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/information.png trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/logout.png trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/logout_new.png trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/manage_users.png trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/open_by_file.png trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/open_by_file_new.png trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/open_by_url.png trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/open_by_url_new.png trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/paypal.gif trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/popup.png trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/preferences.png trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/progress_stop.png trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/quick_connect.png trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/refresh.png trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/right_arrow.gif trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/server.png trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/ssl_disabled.png trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/ssl_enabled.png trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/tool_delete.png trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/tool_pause.png trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/tool_resume.png trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/toolbar.png trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/top.png trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/up.png Modified: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/ajaxWebUI.htm =================================================================== --- trunk/azsmrc/lbms/azsmrc/plugin/web/resources/ajaxWebUI.htm 2008-06-16 22:01:20 UTC (rev 1677) +++ trunk/azsmrc/lbms/azsmrc/plugin/web/resources/ajaxWebUI.htm 2008-06-17 21:50:07 UTC (rev 1678) @@ -10,6 +10,8 @@ <meta name="keywords" content="Azureus Webinterface AzSMRC Plugin remote control" /> <meta name="creation_date" content="04/09/2006" /> <!-- Scripts --> + <script type="text/javascript" src="js/jquery/jquery-1.2.5.min.js"></script> + <script type="text/javascript" src="js/jquery/azsmrc.js"></script> <script type="text/javascript" src="js/debugLog.js"></script> <script type="text/javascript" src="js/fileUpload.js"></script> <script type="text/javascript" src="js/registeredRequests.js"></script> @@ -22,15 +24,14 @@ <script type="text/javascript" src="js/tableSort.js"></script> <!-- Styles --> <link rel="stylesheet" type="text/css" href="css/azsmrc_skin2.css" title="Standard AzSMRC Style" /> - <link rel="alternate stylesheet" type="text/css" href="css/azsmrc_default.css" title="Old AzSMRC Style" /> </head> <body onload="initAzSMRCwebUI();"><div id="azsmrcintro"><h1>AzSMRC - webUserInterface</h1><img src="img/AzSMRC_Splash.png" id="splashscreen" class="invisible" alt="Splashscreen" title="AzSMRC Splashscreen" /><p>This application uses Javascript and requires a modern browser. If you can read this after the page have loaded completly, you may have been disabled Javascript or your browser is not up to date.</p><p>Please contact your system administrator.</p></div> <div id="topbar"> <h2 class="invisible">Menu</h2> - <ul id="picmenu" class="menu"><li class="subbreak"><img src="img/refresh.png" alt="Refresh" title="Refresh" onclick="refreshView();" /></li><li class="subbreak"><img src="img/open_by_url_new.png" alt="Send Torrent to Server" title="Send Torrent to Server" onclick="addTab('torrentControl');" /></li><li><img src="img/top.png" alt="Move to Top" title="Move to Top" onclick="SendRequestToServer(14, 'top');" /></li><li><img src="img/up.png" alt="Move Up" title="Move Up" onclick="SendRequestToServer(15);" /></li><li><img src="img/down.png" alt="Move Down" title="Move Down" onclick="SendRequestToServer(16);" /></li><li class="subbreak"><img src="img/bottom.png" alt="Move to Bottom" title="Move to Bottom" onclick="SendRequestToServer(14, 'bottom');" /></li><li><img src="img/tool_delete.png" alt="Delete" title="Delete" onclick="SendRequestToServer(4);" /></li><li><img src="img/tool_pause.png" alt="Pause" title="Pause" onclick="SendRequestToServer(5);" /></li><li class="subbreak"><img src="img/tool_resume.png" alt="Resume" title="Resume" onclick="SendRequestToServer(7);" /></li><li><img src="img/preferences.png" alt="Open Preferences" title="Open Preferences" onclick="addTab('preferences');" /></li><li><img src="img/manage_users.png" alt="Manage Users" title="Manage Users" onclick="addTab('userManagement'); SendRequestToServer(29);" /></li><!--<li><img src="img/console.png" alt="Open Console" title="Open Console" /></li>--><li><img src="img/information.png" alt="Information" title="Information" onclick="addTab('about');" /></li></ul> + <ul id="picmenu" class="menu"><li><a href="#" id="picmenuactivator" onclick="return false;">Toggle</a></li><li class="subbreak"><img src="img/crystalClear/reload.png" alt="Refresh" title="Refresh" onclick="refreshView();" /></li><li class="subbreak"><img src="img/crystalClear/fileimport.png" alt="Send Torrent to Server" title="Send Torrent to Server" onclick="addTab('torrentControl');" /></li><li><img src="img/crystalClear/top.png" alt="Move to Top" title="Move to Top" onclick="SendRequestToServer(14, 'top');" /></li><li><img src="img/crystalClear/up.png" alt="Move Up" title="Move Up" onclick="SendRequestToServer(15);" /></li><li><img src="img/crystalClear/down.png" alt="Move Down" title="Move Down" onclick="SendRequestToServer(16);" /></li><li class="subbreak"><img src="img/crystalClear/bottom.png" alt="Move to Bottom" title="Move to Bottom" onclick="SendRequestToServer(14, 'bottom');" /></li><li><img src="img/crystalClear/trash.png" alt="Delete" title="Delete" onclick="SendRequestToServer(4);" /></li><li><img src="img/crystalClear/pause.png" alt="Pause" title="Pause" onclick="SendRequestToServer(5);" /></li><li class="subbreak"><img src="img/crystalClear/resume.png" alt="Resume" title="Resume" onclick="SendRequestToServer(7);" /></li><li><img src="img/crystalClear/configure.png" alt="Open Preferences" title="Open Preferences" onclick="addTab('preferences');" /></li><li><img src="img/crystalClear/users.png" alt="Manage Users" title="Manage Users" onclick="addTab('userManagement'); SendRequestToServer(29);" /></li><li class="subbreak"><img src="img/crystalClear/info.png" alt="Information" title="Information" onclick="addTab('about');" /></li><li class="inactive"><img src="img/crystalClear/console.png" alt="Open Console" title="Open Console" /></li></ul> <ul id="tabbar" class="menu"><li>This is a placeholder!</li></ul> <div id="contextmenu">This menu will be filled by Javascript.</div> - </div> + </div> <div id="eventlist" class="tab"><p>No events since last request.</p></div> <div id="tabcontents"></div> <div id="statusbar"><a title="Open Debug Log" onclick="addTab('debug');">Open Debug Log</a><span id="azversion">unknown version</span><span id="azsmrcversion">unknown version</span><span id="eventstatus">no new events</span><span onclick="PingToServer();" id="ping">Ping: undefined</span><span id="requeststatus">no request sent</span><img id="connectionstatus" src="img/connect_no.png" alt="Connection not established" title="Not connected to Server" /></div> Deleted: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/css/azsmrc_default.css =================================================================== --- trunk/azsmrc/lbms/azsmrc/plugin/web/resources/css/azsmrc_default.css 2008-06-16 22:01:20 UTC (rev 1677) +++ trunk/azsmrc/lbms/azsmrc/plugin/web/resources/css/azsmrc_default.css 2008-06-17 21:50:07 UTC (rev 1678) @@ -1,458 +0,0 @@ -/* - * Standard CSS file for AzSMRC Webinterface - * all objects are sorted ascending - */ -/* Elements and Pseudo-Classes */ -a { - font-size: 0.8em; -} -a:hover { - color: #00F; - cursor: pointer; - text-decoration: underline; -} -abbr { - border: none; - cursor: help; - text-decoration: none; -} -body, html { - background-color: #D0D0D9; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 1em; - font-weight: normal; - margin: 0px 0px 0px 0px; - padding: 0px 5px 0px 0px; -} -body { - padding: 60px 0px 25px 0px; -} -body > * { - margin: 0px 5px 10px 0px; - padding: 0px 0px 0px 10px; -} -body > #JS-Hint { - display: none; -} -caption { - border-bottom: #888 1px solid; - font-size: 0.9em; - font-weight: bold; - text-align: left; - padding: 1px 5% 1px 20px; -} -fieldset { - border: #888 1px solid; - margin: 0px 0px 2px 0px; - padding: 5px 5px 5px 5px; - width: 360px; -} -form { - margin: 0px 0px 0px 0px; - width: 400px; -} -h1 { - font-size: 1.2em; - margin: 0px 5px 10px 0px; -} -h2 { - font-size: 1.1em; - margin: 0px 5px 10px 0px; -} -h3 { - font-size: 1.0em; - margin: 0px 5px 10px 0px; -} -td > img { - margin: 0px 0px 0px 5px; -} -input { - background-color: #D0D0D9; - border: #888 1px solid; - margin: 0px 0px 2px 0px; -} -input:hover { - background-color: #DDD; -} -input[type="button"], input[type="submit"] { - width: 120px; -} -input[type="file"] { - width: 200px; -} -label { - font-size: 0.8em; - float: left; - margin: 0px 0px 0px 0px; - padding: 0px 0px 0px 0px; - width: 200px; -} -label:after { - content: ":"; -} -label:hover { - cursor: pointer; - text-decoration: underline; -} -legend { - font-size: 0.9em; - font-weight: bold; - margin: 0px 0px 0px 0px; - padding: 0px 2px 0px 2px; -} -p { - font-size: 0.9em; - margin: 0px 5px 5px 0px; - text-align: justify; -} -table { - border-collapse: collapse; - border-color: #888; - width: 100%; -} -tbody { - border-bottom: #888 1px solid; -} -tbody tr td:first-Child, thead tr th:first-Child { - border-left-style: solid; - padding-left: 5px; -} -tbody tr td:last-Child, thead tr th:last-Child { - border-right-style: solid; -} -td, th { - border-left: #888 1px dotted; - border-right: #888 1px dotted; - font-size: 0.8em; - padding: 0px 2px 0px 2px; - text-align: left; - vertical-align: top; - white-space: nowrap; -} -tbody > tr:hover { - background-color: #DDD; -} -/* Classes */ -.activeTC { - background-color: #EEE; -} -.closeButton { - float: right; - margin: 5px 0px 0px 0px; -} -.debuglist { - list-style: none outside none; - margin: -10px 0px 10px 0px; - max-height: 400px; - overflow-x: auto; - padding: 0px 0px 0px 25px; -} -.debuglist li { - font-size: 0.7em; - text-indent: -20px; -} -.debuglist li:first-Line { - text-indent: 0px; -} -fieldset > p.description { - font-size: 0.8em; - font-style: italic; -} -form > p.description { - font-size: 0.9em; - font-style: italic; - margin: 0px 0px 2px 0px; - padding: 0px 5px 0px 5px; - text-align: justify; - width: 360px; -} -.dragbar { - background-color: #C0C0C0; - display: block; - height: 15px; - margin: -1px -2px 2px -2px; - text-align: right; -} -.dragbar:hover { - cursor: pointer; -} -.dragbar h2 { - font-size: 0.8em; - font-weight: bold; - float: left; - height: 15px; - margin: 0px 0px 0px 20px; - overflow: visible; -} -.dragbar img { - margin: 0px 1px 1px 0px; - z-index: 2; -} -ul.eventDetails { - list-style: none outside none; - margin: 0px 0px 0px 0px; - padding:0px 0px 0px 0px; -} -.fixdragbar { - background-color: #DDD; - display: block; - height: 15px; - margin: -1px -2px 2px -2px; - text-align: right; -} -.fixdragbar h2 { - font-size: 0.8em; - font-weight: bold; - float: left; - height: 5px; - margin: 0px 0px 0px 20px; - overflow: visible; -} -.fixdragbar img { - margin: -1px 1px 1px 0px; -} -.form_checks { - width: 220px; -} -p.hint { - font-size: 0.8em; - font-style: italic; -} -input.interact { - margin: 0px 0px 1px 0px; - text-align: left; - width: 100%; -} -.invisible { - display: none; -} -ul.menu { - display: block; - list-style: none inside none; - height: auto; - padding: 0px 0px 0px 0px; - vertical-align: top; -} -ul.menu img { - height: 22px; - margin: 0px 5px 0px 2px; - width: 22px; -} -ul.menu li { - display: inline; - height: auto; - margin: 0px 0px 0px 0px; - padding: 0px 0px 0px 0px; -} -div.moveTab { - -moz-opacity:0.8; - background: #D0D0D9; - border: #888 1px solid; - display: block; - /* filter:alpha(opacity=80); */ - max-width: 1000px; - min-width: 440px; - /* label + file input */ - padding: 1px 2px 2px 2px; - width: auto; -} -.moveTab:hover, -.moveTab .dragbar:hover { - cursor: move; -} -li.subbreak a { - border-bottom: #C0C0C0 1px solid; -} -ul.submenu { - display: block; - position: relative; - vertical-align: top; -} -ul.submenu li a { - display: block; - width: 200px; -} -div.tab { - display: block; - background: #D0D0D9; - border: #888 1px solid; - max-width: 1000px; - min-width: 440px; - /* label + file input */ - padding: 1px 2px 2px 2px; - width: auto; -} -input.transferCtrl { - margin: 3px 0px 0px 0px; -} -/* IDs */ -#advinteractform input[type="button"] { - display: block; - width: 200px; -} -#contextmenu { - background-color: #D0D0D9; - border: #888 1px solid; - display: none; - min-height: 100px; - padding: 2px 2px 20px 2px; - width: 200px; -} -#contextmenu h2 { - background-color: #DDD; - border-bottom: #888 1px solid; - font-size: 0.9em; - margin: -2px -2px 0px -2px; - text-align: center; -} -#contextmenu > input:last-Child { - position: absolute; - left: 0px; - bottom: 0px; - margin: 2px 2px 2px 2px; -} -#contextmenu ul { - list-style: none inside none; - margin: 0px 0px 0px 5px; - padding: 0px 0px 0px 0px; -} -#cookie_autorefresh { - display: block; - margin-left: 199px; - width: 15px; -} -#eventlist { - display: none; -} -#eventlist table { - margin: 0px 0px 2px 0px; -} -#labelselectionform { - background-color: #D0D0D9; - border: #888 1px solid; - display: none; - left: 40%; - padding: 1px 2px 2px 2px; - position: absolute; - top: 5%; - width: 220px; -} -#labelselectionform > label { - margin: 1px 0px 0px 0px; -} -#labelselectionform > input[type="checkbox"] { - margin: 0px 0px 2px 0px; -} -#interactionform { - background-color: #D0D0D9; - border: #888 1px solid; - display: none; - padding: 2px 2px 2px 2px; - position: absolute; - top: 5%; - left: 65%; -} -#interaction_container { - border: #888 1px solid; - display: none; - padding: 1px 5% 2px 1%; -} -#interaction_container > ul { - list-style: none; - margin: 0px 0px 0px 0px; - padding: 0px 0px 0px 0px; -} -#picmenu { - background-color: #D0D0D9; - border-bottom: #888 1px solid; - display: block; - height: 22px; - margin: 0px 0px 10px 0px; - padding: 0px 5% 3px 2%; -} -#picmenu img:hover { - cursor: pointer; -} -#picmenu .subbreak img { - border-right: #888 1px solid; - margin-right: 0px; - padding: 1px 5px 3px 0px; - vertical-align: top; -} -#splashscreen { - left: 50%; - margin: -127px 0px 0px -200px; - position: absolute; - top: 50%; - z-index: 10; -} -#statusbar { - background-color: #D0D0D9; - border-top: #C0C0C0 1px solid; - bottom: 0px; - font-size: 0.8em; - height: 17px; - margin: 0px 0px 0px 0px; - text-align: right; - padding: 0px 2% 0px 5%; - position: fixed; - width: 93%; -} -#statusbar > * { - border-left: #C0C0C0 1px solid; - font-size: 0.9em; - margin: 0px 0px 0px 0px; - padding: 4px 5px 2px 5px; - vertical-align: middle; -} -#statusbar img { - height: 16px; - padding: 0px 5px 0px 5px; - width: 16px; -} -#tabbar { - background-color: #F7EBAB; - border-bottom: #C4B878 1px solid; - display: block; - font-size: 0.9em; - height: 20px; - margin: 0px 0px 10px 0px; - padding: 1px 5% 0px 2%; -} -#tabbar li { - border: #C4B878 1px solid; - display: block; - float: left; - height: 17px; - margin: -1px 10px 0px 0px; - padding: 2px 3px 1px 3px; -} -#tabbar li:hover { - border-bottom: #F7EBAB 1px dashed; - cursor: pointer; -} -#tabbar li.active { - border-bottom: #D0D0D9 1px solid; -} -#tabbar li span { - color: #00F; - vertical-align: top; -} -#tabbar img { - height: 17px; - margin: -1px 0px 0px 5px; - vertical-align: bottom; - width: 17px; -} -#tabbar img:hover { - cursor: pointer; -} -#topbar { - background-color: #D0D0D9; - display: block; - height: 60px; - padding: 0px 0px 0px 0px; - position: fixed; - top: 0px; - width: 100%; -} \ No newline at end of file Modified: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/css/azsmrc_skin2.css =================================================================== --- trunk/azsmrc/lbms/azsmrc/plugin/web/resources/css/azsmrc_skin2.css 2008-06-16 22:01:20 UTC (rev 1677) +++ trunk/azsmrc/lbms/azsmrc/plugin/web/resources/css/azsmrc_skin2.css 2008-06-17 21:50:07 UTC (rev 1678) @@ -26,6 +26,7 @@ body { background: transparent url(../img/skin2/azsmrc_typer.png) no-repeat fixed right 32px; color: #FFF; + font-size: 12px; padding: 120px 0px 25px 0px; } body > * { @@ -36,21 +37,21 @@ display: none; } caption { - border-bottom: #DDD 1px solid; + border-bottom: #AAA 1px solid; font-size: 0.9em; font-weight: bold; text-align: left; padding: 1px 5% 1px 20px; } fieldset { - border: #DDD 1px solid; + border: #AAA 1px solid; margin: 0px 0px 2px 0px; padding: 5px 5px 5px 5px; width: 360px; } form { margin: 0px 0px 0px 0px; - width: 400px; + max-width: 400px; } h1 { font-size: 1.2em; @@ -80,18 +81,23 @@ input:hover { background-color: #2654F1; } +input[type="text"], input[type="password"] { + width: 150px; +} input[type="button"], input[type="submit"] { width: 120px; } input[type="file"] { + clear: left; + display: block; width: 200px; } -label { +label { font-size: 0.8em; float: left; - margin: 0px 0px 0px 0px; + margin: 0px 2px 0px 0px; padding: 0px 0px 0px 0px; - width: 200px; + width: 198px; } label:after { content: ":"; @@ -113,11 +119,11 @@ } table { border-collapse: collapse; - border-color: #DDD; + border-color: #AAA; width: 100%; } tbody { - border-bottom: #DDD 1px solid; + border-bottom: #AAA 1px solid; } tbody tr td:first-Child, thead tr th:first-Child { border-left-style: solid; @@ -127,8 +133,8 @@ border-right-style: solid; } td, th { - border-left: #DDD 1px dotted; - border-right: #DDD 1px dotted; + border-left: #AAA 1px dotted; + border-right: #AAA 1px dotted; font-size: 0.8em; padding: 1px 2px 0px 2px; text-align: left; @@ -174,7 +180,8 @@ } .dragbar { background-color: #FFF; - border: #2635AF 1px solid; + border-left: #FFF 1px solid; + border-right: #FFF 1px solid; border-bottom: #000 1px solid; display: block; height: 16px; @@ -204,7 +211,8 @@ } .fixdragbar { background-color: #EEE; - border: #2635AF 1px solid; + border-left: #EEE 1px solid; + border-right: #EEE 1px solid; border-bottom: #000 1px solid; display: block; height: 16px; @@ -240,7 +248,7 @@ } ul.menu { display: block; - list-style: none inside none; + list-style: none inside none; height: auto; padding: 0px 0px 0px 0px; vertical-align: top; @@ -263,7 +271,6 @@ display: block; /* filter:alpha(opacity=80); */ max-width: 1000px; - min-width: 440px; /* label + file input */ padding: 1px 2px 2px 2px; width: auto; @@ -276,6 +283,7 @@ visibility: visible; } .moveTab .dragbar { + border-bottom: none; border-color: transparent; } .moveTab:hover, @@ -283,11 +291,11 @@ cursor: move; } li.subbreak a { - border-bottom: #FFF 1px solid; + border-bottom: #FFF 1px solid; } ul.submenu { display: block; - position: relative; + position: relative; vertical-align: top; } ul.submenu li a { @@ -297,9 +305,8 @@ div.tab { display: block; background: #010E94 url(../img/skin2/background.png) repeat-x fixed top left; - border: #DDD 1px solid; + border: #FFF 1px solid; max-width: 1000px; - min-width: 440px; /* label + file input */ padding: 1px 2px 2px 2px; width: auto; @@ -314,9 +321,9 @@ } #contextmenu { background-color: #0053BF; - border: #2635AF 1px solid; + border: #FFF 1px solid; display: none; - min-height: 100px; + min-height: 40px; padding: 2px 2px 20px 2px; width: 200px; } @@ -330,15 +337,22 @@ } #contextmenu > input:last-Child { position: absolute; - left: 0px; + left: 50%; bottom: 0px; - margin: 2px 2px 2px 2px; + margin: 2px auto 2px -60px; + width: 120px; } #contextmenu ul { + display: block; list-style: none inside none; - margin: 0px 0px 0px 5px; + margin: 10px auto 5px auto; padding: 0px 0px 0px 0px; + width: 120px; } +#contextmenu li { + display: inline; + margin: 0px 10px 0px 0px; +} #cookie_autorefresh { display: block; margin-left: 199px; @@ -366,6 +380,31 @@ #labelselectionform > input[type="checkbox"] { margin: 0px 0px 2px 0px; } +#labelselectionform.moveTab { + -moz-opacity:0.8; + background: #010E94 url(../img/skin2/background.png) repeat-x fixed top left; + border: #CCC 1px solid; + display: block; + /* filter:alpha(opacity=80); */ + /* label + file input */ + padding: 1px 2px 2px 2px; + width: 220px; +} +#labelselectionform.moveTab * { + visibility: hidden; +} +#labelselectionform.moveTab .dragbar, +#labelselectionform.moveTab .dragbar * { + visibility: visible; +} +#labelselectionform.moveTab .dragbar { + border-bottom: none; + border-color: transparent; +} +#labelselectionform.moveTab:hover, +#labelselectionform.moveTab .dragbar:hover { + cursor: move; +} #interactionform { background-color: #0053BF; border: #2635AF 1px solid; @@ -385,22 +424,53 @@ margin: 0px 0px 0px 0px; padding: 0px 0px 0px 0px; } -#picmenu { - background: transparent; +#picmenuactivator { + /* background: transparent url(../img/toolbar.png) no-repeat bottom center; */ border: none; + bottom: 5px; + color: #000 !important; display: block; - height: 22px; - margin: 5px 0px 40px 0px; - padding: 0px 5% 3px 40px; + font-family: monospace; + height: 12px; + left: 50%; + margin: 0px 0px 0px -355px; + position: absolute; + text-align: center; + text-decoration: none; + width: 710px; } +#picmenu { + background: transparent url(../img/skin2/toolbar.png) no-repeat bottom left; + color: #000; + display: block; + height: 10px; + margin: -3px auto 0px -345px; + left: 50%; + padding: 10px 10px 0px 10px; + position: absolute; + top: 0px; + width: 690px; +} +#picmenu img { + display: none; + height: auto; + max-height: 32px; + max-width: 32px; + vertical-align: top; + width: auto; +} +#picmenu.active img { + display: inline; +} #picmenu img:hover { cursor: pointer; } #picmenu .subbreak img { - margin-right: 50px; - padding: 1px 5px 3px 0px; - vertical-align: top; + margin-right: 30px; } +#picmenu .inactive { + opacity: 0.4; +} #splashscreen { left: 50%; margin: -127px 0px 0px -200px; @@ -441,7 +511,7 @@ display: block; font-size: 1em; height: 41px; - margin: 0px 0px 10px 47px; + margin: 70px 0px 10px 47px; padding: 0px 5% 0px 2%; } #tabbar li { Deleted: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/bottom.png =================================================================== (Binary files differ) Deleted: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/connect.png =================================================================== (Binary files differ) Deleted: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/connect_new.png =================================================================== (Binary files differ) Deleted: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/connect_quick_new.png =================================================================== (Binary files differ) Deleted: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/console.png =================================================================== (Binary files differ) Added: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/crystalClear/bottom.png =================================================================== (Binary files differ) Property changes on: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/crystalClear/bottom.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/crystalClear/close.png =================================================================== (Binary files differ) Property changes on: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/crystalClear/close.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/crystalClear/configure.png =================================================================== (Binary files differ) Property changes on: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/crystalClear/configure.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/crystalClear/console.mng =================================================================== (Binary files differ) Property changes on: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/crystalClear/console.mng ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/crystalClear/console.png =================================================================== (Binary files differ) Property changes on: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/crystalClear/console.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/crystalClear/down.png =================================================================== (Binary files differ) Property changes on: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/crystalClear/down.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/crystalClear/fileimport.png =================================================================== (Binary files differ) Property changes on: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/crystalClear/fileimport.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/crystalClear/info.png =================================================================== (Binary files differ) Property changes on: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/crystalClear/info.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/crystalClear/pause.png =================================================================== (Binary files differ) Property changes on: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/crystalClear/pause.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/crystalClear/reload.png =================================================================== (Binary files differ) Property changes on: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/crystalClear/reload.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/crystalClear/resume.png =================================================================== (Binary files differ) Property changes on: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/crystalClear/resume.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/crystalClear/top.png =================================================================== (Binary files differ) Property changes on: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/crystalClear/top.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/crystalClear/torrentControl/delete.png =================================================================== (Binary files differ) Property changes on: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/crystalClear/torrentControl/delete.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/crystalClear/torrentControl/force_start.png =================================================================== (Binary files differ) Property changes on: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/crystalClear/torrentControl/force_start.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/crystalClear/torrentControl/start.png =================================================================== (Binary files differ) Property changes on: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/crystalClear/torrentControl/start.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/crystalClear/torrentControl/stop.png =================================================================== (Binary files differ) Property changes on: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/crystalClear/torrentControl/stop.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/crystalClear/trash.png =================================================================== (Binary files differ) Property changes on: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/crystalClear/trash.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/crystalClear/up.png =================================================================== (Binary files differ) Property changes on: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/crystalClear/up.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/crystalClear/users.png =================================================================== (Binary files differ) Property changes on: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/crystalClear/users.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Deleted: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/delete.png =================================================================== (Binary files differ) Deleted: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/down.png =================================================================== (Binary files differ) Deleted: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/down_arrow.gif =================================================================== (Binary files differ) Deleted: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/edit_add.png =================================================================== (Binary files differ) Deleted: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/firefrog_icon.png =================================================================== (Binary files differ) Deleted: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/gg_connecting.gif =================================================================== (Binary files differ) Deleted: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/information.png =================================================================== (Binary files differ) Deleted: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/logout.png =================================================================== (Binary files differ) Deleted: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/logout_new.png =================================================================== (Binary files differ) Deleted: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/manage_users.png =================================================================== (Binary files differ) Deleted: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/open_by_file.png =================================================================== (Binary files differ) Deleted: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/open_by_file_new.png =================================================================== (Binary files differ) Deleted: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/open_by_url.png =================================================================== (Binary files differ) Deleted: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/open_by_url_new.png =================================================================== (Binary files differ) Deleted: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/paypal.gif =================================================================== (Binary files differ) Deleted: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/popup.png =================================================================== (Binary files differ) Deleted: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/preferences.png =================================================================== (Binary files differ) Deleted: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/progress_stop.png =================================================================== (Binary files differ) Deleted: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/quick_connect.png =================================================================== (Binary files differ) Deleted: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/refresh.png =================================================================== (Binary files differ) Deleted: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/right_arrow.gif =================================================================== (Binary files differ) Deleted: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/server.png =================================================================== (Binary files differ) Copied: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/skin2/toolbar.png (from rev 1677, trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/toolbar.png) =================================================================== (Binary files differ) Deleted: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/ssl_disabled.png =================================================================== (Binary files differ) Deleted: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/ssl_enabled.png =================================================================== (Binary files differ) Deleted: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/tool_delete.png =================================================================== (Binary files differ) Deleted: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/tool_pause.png =================================================================== (Binary files differ) Deleted: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/tool_resume.png =================================================================== (Binary files differ) Deleted: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/toolbar.png =================================================================== (Binary files differ) Deleted: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/top.png =================================================================== (Binary files differ) Deleted: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/img/up.png =================================================================== (Binary files differ) Modified: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/js/azsmrc_main.js =================================================================== --- trunk/azsmrc/lbms/azsmrc/plugin/web/resources/js/azsmrc_main.js 2008-06-16 22:01:20 UTC (rev 1677) +++ trunk/azsmrc/lbms/azsmrc/plugin/web/resources/js/azsmrc_main.js 2008-06-17 21:50:07 UTC (rev 1678) @@ -1,4 +1,4 @@ -var Server = window.location.href; +var Server = window.location.protocol+'//'+window.location.hostname+':'+window.location.port; /* example request XML sent to Server <?xml version="1.0" encoding="UTF-8"?> <Request version="1.0"> @@ -29,12 +29,17 @@ document.styleSheets[s]["cssRules"][r].style["max-width"] = maxwidth+"px"; } } +function changeStatus(status) { + // write status to statusbar + var statusbarentry = document.getElementById("requeststatus").firstChild; + statusbarentry.data = status; +} function configAutoRefresh() { var regTabID, i; for (i in autoRefreshObjs) if (autoRefreshObjs[i] != null) window.clearInterval(autoRefreshObjs[i]); - for (i in tabs) + for (i in tabs) if (tabs[i]) { regTabID = getRegTabById(i); if (autoRefresh[regTabID] > 0) { @@ -56,7 +61,7 @@ return xmlhttp; } function doAutoRefresh(regTabID) { - if (refreshRequests[regTabID] > -1) + if (refreshRequests[regTabID] > -1) SendRequestToServer(refreshRequests[regTabID]); } function doNothing() { @@ -89,13 +94,17 @@ img.src = "img/connect_established.png"; img.setAttribute("alt","Connection established"); img.setAttribute("title","Connected to Server"); - } + } break; case "listTransfers": handlelistTransfers(doc); break; case "getRemoteInfo": - document.getElementById("azversion").firstChild.data = "Azureus "+results[i].getAttribute("azureusVersion"); + if (results[i].getAttribute("azureusVersion")[0] == 3) + version = "Vuze "+results[i].getAttribute("azureusVersion"); + else + version = "Azureus "+results[i].getAttribute("azureusVersion"); + document.getElementById("azversion").firstChild.data = version; document.getElementById("azsmrcversion").firstChild.data = "AzSMRC "+results[i].getAttribute("pluginVersion"); break; case "getUsers": @@ -106,7 +115,7 @@ var users = doc.getElementsByTagName("User"); while (userTable.firstChild) userTable.removeChild(userTable.firstChild); var tr, td; - for (var j in users) + for (var j in users) if (j < users.length) { tr = document.createElement("tr"); td = document.createElement("td"); @@ -159,7 +168,7 @@ options += Math.pow(2, i); } options = ' options="'+options+'"'; - return options; + return options; break; case "addDownload": var torrentURL = document.getElementById("torrentURL").value; @@ -188,10 +197,10 @@ request += '<Query switch="'+req+'" location="url"'+getRequestOptions(req)+' />'; if (request == '<Query switch="'+req+'" location="url" />') request = ''; - break; - case "removeDownload": + break; + case "removeDownload": if (!window.confirm("Are you sure to delete all selected downloads and uploads?")) - break; + break; if (par) { request += '<Query switch="'+req+'" hash="'+par+'" />'; } else @@ -220,7 +229,7 @@ for (var i in selectedTransfers) if (selectedTransfers[i] != null) request += '<Query switch="'+req+'" hash="'+selectedTransfers[i]+'" />'; - + break; case "moveToPosition": for (var i in selectedTransfers) @@ -229,14 +238,14 @@ position = 1; else if (par == "bottom") position = positions[getLoadType(selectedTransfers[i])]; - else + else position = par; request += '<Query switch="'+req+'" position="'+position+'" hash="'+selectedTransfers[i]+'" />'; } break; default: request += '<Query switch="'+req+'" />'; - break; + break; } return request; } @@ -254,7 +263,7 @@ addTab("listTransfers", true); initTabControl(); adjustMaxTabWidth(); - setJSHint(); + setJSHint(); //showSplashScreen(); configAutoRefresh(); PingToServer(); @@ -289,7 +298,6 @@ function refreshView() { switch (tabs[activeTab]) { case "listTransfers": - selectedTransfers = []; // listTransfers SendRequestToServer(1); break; @@ -300,7 +308,7 @@ // getRemoteInfo SendRequestToServer(40); break; - default: + default: PingToServer(); break; } @@ -322,12 +330,12 @@ value = Math.floor(document.getElementById("cookie_autorefresh_"+i).value); if (!Math.floor(value)) document.getElementById("cookie_autorefresh_"+i).value = 0; - autoRefresh[i] = value > 0 ? value : 0; + autoRefresh[i] = value > 0 ? value : 0; } if (i > 0) startupTabs[i] = document.getElementById("startup_"+i).checked; tab = getTabByContent(registeredTabs[i]); - if (tab && tab.style.left) { + if (tab && tab.style.left) { tabPos[pos] = [i, tab.style.left, tab.style.top, tab.style.zIndex]; pos++; } @@ -341,8 +349,8 @@ // startup tabs value = startupTabs.join(","); setCookie("startupTabs", value, now); - // auto refresh - var saveCookie = document.getElementById("cookie_autorefresh").checked; + // auto refresh + var saveCookie = document.getElementById("cookie_autorefresh").checked; if (saveCookie) { // set autorefresh cookie value = autoRefresh.join(","); @@ -358,7 +366,7 @@ azsmrcOptions = value; value = value.join(","); setCookie("azsmrcOptions", value, now); - } + } addDebugEntry("saved Cookies: "+document.cookie); } function selectDetails(id) { @@ -378,7 +386,7 @@ selectedTransfers[i] = hash; inserted = true; break; - } + } } if (!inserted) { selectedTransfers[selectedTransfers.length] = hash; @@ -391,44 +399,44 @@ } } } - obj.className = (input.checked == true)? "activeTC" : ""; - // addDebugEntry("selected Transfers: "+selectedTransfers); + obj.className = (input.checked == true) ? "activeTC" : ""; + addDebugEntry("selected Transfers: "+selectedTransfers); } function SendRequestToServer(request, par) { request = registeredRequests[request]; // respondig file fo server: process.cgi // edit line below if changes - var requestURL = Server+"process.cgi"; + var requestURL = Server+"/process.cgi"; var xmlhttp = createXMLHTTP(); if (xmlhttp) { - var statusbarentry = document.getElementById("requeststatus").firstChild; var xmlrequest = '<?xml version="1.0" encoding="UTF-8"?><Request version="1.0">'+getRequestQuery(request, par)+'</Request>'; // no empty requests if (xmlrequest != '<?xml version="1.0" encoding="UTF-8"?><Request version="1.0"></Request>') { addDebugEntry("XML Request: "+xmlrequest); xmlhttp.open("POST", requestURL, true); - xmlhttp.setRequestHeader("Content-type","application/xml"); - xmlhttp.setRequestHeader("Connection","close"); + xmlhttp.setRequestHeader("Content-type","application/xml"); + xmlhttp.setRequestHeader("Connection","close"); xmlhttp.onreadystatechange = function () { switch (xmlhttp.readyState) { case 0: - statusbarentry.data = "uninitialized"; + changeStatus("uninitialized"); break; case 1: - statusbarentry.data = "open request"; + changeStatus("open request"); break; case 2: - statusbarentry.data = "request sent"; + changeStatus("request sent"); break; case 3: - statusbarentry.data = "receiving response"; + changeStatus("receiving response"); break; case 4: - statusbarentry.data = "response loaded"; - fetchData(xmlhttp); + changeStatus("response loaded"); + fetchData(xmlhttp); + changeStatus("data fetched"); break; default: - statusbarentry.data = "unknown state"; + changeStatus("unknown state"); break; } } Modified: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/js/contextMenu.js =================================================================== --- trunk/azsmrc/lbms/azsmrc/plugin/web/resources/js/contextMenu.js 2008-06-16 22:01:20 UTC (rev 1677) +++ trunk/azsmrc/lbms/azsmrc/plugin/web/resources/js/contextMenu.js 2008-06-17 21:50:07 UTC (rev 1678) @@ -3,7 +3,7 @@ var contextCallObj = null; function checkContextMenu(event) { contextDraw = (event.button == 2) ? true : false; - contextCallObj = event.target; + contextCallObj = event.target; if ((event.shiftKey) && (event.button == 0)) { contextDraw = true; addDebugEntry("valid"); @@ -25,6 +25,7 @@ addDebugEntry("contextCallObj: "+contextCallObj.tagName.toLowerCase()); var menulist, menuitem, link; var head = document.createElement("h2"); + var img; switch (contextCallObj.tagName.toLowerCase()) { case "td": // is TC @@ -34,30 +35,51 @@ head.appendChild(document.createTextNode("Torrent Control")); contextMenu.appendChild(head); menulist = document.createElement("ul"); + menuitem = document.createElement("li"); link = document.createElement("a"); - link.onclick = function () { SendRequestToServer(7, hash); } - link.appendChild(document.createTextNode("start torrent")); + link.onclick = function () { SendRequestToServer(4, hash); } + img = document.createElement("img"); + img.src = "img/crystalClear/torrentControl/delete.png"; + img.setAttribute("alt", "Delete Torrent"); + img.setAttribute("title", "Delete Torrent"); + link.appendChild(img); menuitem.appendChild(link); menulist.appendChild(menuitem); + menuitem = document.createElement("li"); link = document.createElement("a"); - link.onclick = function () { SendRequestToServer(13, hash); } - link.appendChild(document.createTextNode("force start torrent")); + link.onclick = function() { SendRequestToServer(5, hash); } + img = document.createElement("img"); + img.src = "img/crystalClear/torrentControl/stop.png"; + img.setAttribute("alt", "Stop Torrent"); + img.setAttribute("title", "Stop Torrent"); + link.appendChild(img); menuitem.appendChild(link); menulist.appendChild(menuitem); + menuitem = document.createElement("li"); link = document.createElement("a"); - link.onclick = function() { SendRequestToServer(5, hash); } - link.appendChild(document.createTextNode("stop torrent")); + link.onclick = function () { SendRequestToServer(7, hash); } + img = document.createElement("img"); + img.src = "img/crystalClear/torrentControl/start.png"; + img.setAttribute("alt", "Start Torrent"); + img.setAttribute("title", "Start Torrent"); + link.appendChild(img); menuitem.appendChild(link); menulist.appendChild(menuitem); + menuitem = document.createElement("li"); link = document.createElement("a"); - link.onclick = function () { SendRequestToServer(4, hash); } - link.appendChild(document.createTextNode("delete torrent")); + link.onclick = function () { SendRequestToServer(13, hash); } + img = document.createElement("img"); + img.src = "img/crystalClear/torrentControl/force_start.png"; + img.setAttribute("alt", "Force Start Torrent"); + img.setAttribute("title", "Force Start Torrent"); + link.appendChild(img); menuitem.appendChild(link); menulist.appendChild(menuitem); + contextMenu.appendChild(menulist); } break; Modified: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/js/fileUpload.js =================================================================== --- trunk/azsmrc/lbms/azsmrc/plugin/web/resources/js/fileUpload.js 2008-06-16 22:01:20 UTC (rev 1677) +++ trunk/azsmrc/lbms/azsmrc/plugin/web/resources/js/fileUpload.js 2008-06-17 21:50:07 UTC (rev 1678) @@ -3,36 +3,39 @@ var head = document.createElement("h2"); head.appendChild(document.createTextNode("Torrent Control")); div.appendChild(head); - head = document.createElement("h3"); + var fieldset = document.createElement("fieldset"); + head = document.createElement("legend"); head.appendChild(document.createTextNode("Add Torrent by File Upload")); - div.appendChild(head); + fieldset.appendChild(head); var form = document.createElement("form"); form.setAttribute("enctype", "multipart/form-data"); var label = document.createElement("label"); label.appendChild(document.createTextNode("TorrentFile")); label.setAttribute("for", "torrentfile"); - form.appendChild(label); + fieldset.appendChild(label); var input = document.createElement("input"); input.setAttribute("type", "file"); input.setAttribute("id", "torrentfile"); input.setAttribute("name", "torrentfile"); - form.appendChild(input); + fieldset.appendChild(input); input = document.createElement("input"); input.setAttribute("type", "button"); input.setAttribute("name", "uplsubmit"); input.setAttribute("value", "Send file"); input.onclick = function () { uploadFile(); }; - form.appendChild(input); + fieldset.appendChild(input); + form.appendChild(fieldset); div.appendChild(form); - - head = document.createElement("h3"); + + fieldset = document.createElement("fieldset"); + head = document.createElement("legend"); head.appendChild(document.createTextNode("Add Torrent by URL")); - div.appendChild(head); + fieldset.appendChild(head); form = document.createElement("form"); p = document.createElement("p"); p.appendChild(document.createTextNode("http, ftp and magnet works")); p.className = "hint"; - form.appendChild(p); + fieldset.appendChild(p); label = document.createElement("label"); label.setAttribute("for", "torrentURL"); label.appendChild(document.createTextNode("Torrent URL")); @@ -40,39 +43,40 @@ input.setAttribute("type", "text"); input.setAttribute("id", "torrentURL"); input.value = "http://"; - form.appendChild(label); - form.appendChild(input); + fieldset.appendChild(label); + fieldset.appendChild(input); p = document.createElement("p"); p.appendChild(document.createTextNode("Leave information below empty if torrent is public")); p.className = "hint"; - form.appendChild(p); - + fieldset.appendChild(p); + label = document.createElement("label"); label.setAttribute("for", "torrentUser"); label.appendChild(document.createTextNode("Torrent user")); input = document.createElement("input"); input.setAttribute("type", "text"); input.setAttribute("id", "torrentUser"); - form.appendChild(label); - form.appendChild(input); - + fieldset.appendChild(label); + fieldset.appendChild(input); + label = document.createElement("label"); label.setAttribute("for", "torrentPasswd"); label.appendChild(document.createTextNode("Torrent password")); input = document.createElement("input"); input.setAttribute("type", "password"); input.setAttribute("id", "torrentPasswd"); - form.appendChild(label); - form.appendChild(input); - + fieldset.appendChild(label); + fieldset.appendChild(input); + input = document.createElement("input"); input.setAttribute("type", "button"); input.value = "Send to Server"; input.onclick = function () { SendRequestToServer(3); } - form.appendChild(input); - div.appendChild(form); + fieldset.appendChild(input); + form.appendChild(fieldset); + div.appendChild(form); return div; } function encode64(input) { @@ -107,7 +111,7 @@ netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect"); } catch (e) { alert("Permission to read file was denied.\nPlease check your security settings."); - } + } // open the local file var file = Components.classes["@mozilla.org/file/local;1"].createInstance(Components.interfaces.nsILocalFile); file.initWithPath(filename); @@ -119,11 +123,10 @@ bstream.QueryInterface(Components.interfaces.nsIInputStream); binary = Components.classes["@mozilla.org/binaryinputstream;1"].createInstance(Components.interfaces.nsIBinaryInputStream); binary.setInputStream(stream); - + var requestURL = Server+"process.cgi"; - var xmlhttp = createXMLHTTP(); + var xmlhttp = createXMLHTTP(); if (xmlhttp) { - var statusbarentry = document.getElementById("requeststatus").firstChild; var filecontent = encode64(binary.readBytes(binary.available())); var xmlrequest = '<?xml version="1.0" encoding="UTF-8"?><Request version="1.0">' + '<Query switch="addDownload" location="xml">' @@ -134,23 +137,23 @@ xmlhttp.onreadystatechange = function () { switch (xmlhttp.readyState) { case 0: - statusbarentry.data = "uninitialized"; + changeStatus("uninitialized"); break; case 1: - statusbarentry.data = "open request"; + changeStatus("open request"); break; case 2: - statusbarentry.data = "request sent"; + changeStatus("request sent"); break; case 3: - statusbarentry.data = "receiving response"; + changeStatus("receiving response"); break; case 4: - statusbarentry.data = "response loaded"; + changeStatus("response loaded"); addDebugEntry("XML Response: "+xmlhttp.responseText); break; default: - statusbarentry.data = "unknown state"; + changeStatus("unknown state"); break; } } Modified: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/js/handleRequests.js =================================================================== --- trunk/azsmrc/lbms/azsmrc/plugin/web/resources/js/handleRequests.js 2008-06-16 22:01:20 UTC (rev 1677) +++ trunk/azsmrc/lbms/azsmrc/plugin/web/resources/js/handleRequests.js 2008-06-17 21:50:07 UTC (rev 1678) @@ -10,9 +10,9 @@ var eventTypes = ["unknown", "Download Completed", "Download Torrent Removed", "Download Exception", "System Exception", "Update Available", "Message", "Error Message", "Plugin Message"]; // additional interactions listed in interaction menu // with selected torrents -var interactions = [["request download scrape",17], ["request download announce", 18]]; +var interactions = [["request download scrape", 17], ["request download announce", 18]]; // with all torrents at once -var globalinteractions = [["start all downloads", 21], ["resume all downloads", 24], ["stop all downloads",22]]; +var globalinteractions = [["start all downloads", 21], ["resume all downloads", 24], ["stop all downloads", 22]]; // system (admin) interactions var systeminteractions = [["restart Azureus", 39]]; function addAdvInteraction() { @@ -587,6 +587,7 @@ ulbody = document.createElement("tbody"); // filling tbody var transferCtrl = null; + var dli, uli = 0; for (j in transferDataField) if (j > 0) { // check dl or ul @@ -620,8 +621,17 @@ tr.appendChild(td); } } - if (activeTable == 0) dlbody.appendChild(tr); - else ulbody.appendChild(tr); + if (activeTable == 0) { + dli++; + if (dli % 2) tr.className = "odd"; + else tr.className = "even"; + dlbody.appendChild(tr); + } else { + uli++; + if (uli % 2) tr.className = "odd"; + else tr.className = "even"; + ulbody.appendChild(tr); + } positions[activeTable]++; } if (dlbody.hasChildNodes()) { Added: trunk/azsmrc/lbms/azsmrc/plugin/web/resources/js/jquery/azsmrc.js =================================================================== --- trunk/azsmrc/lbms/azsmrc/plugin/web/resources/js/jquery/azsmrc.js (rev 0) +++ trunk/azsmrc/lbms/azsmrc/plugin/web/resources/js/jquery/azsmrc.js 2008-06-17 21:50:07 UTC (rev 1678) @@ -0,0 +1,24 @@ +$(document).ready(function () { + $("a#picmenuactivator").toggle(function () { + $("#picmenu") + .animate({ + height: '54px' + }, { + queue: "true", + duration: "slow", + complete: function () { + $("#picmenu").addClass('active'); + } + } + ); + }, function (){ + $("#picmenu") + .removeClass('active') + .animate({ + height:... [truncated message content] |