d4708
/
qBittorrent
mirror of https://github.com/d47081/qBittorrent.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #11054 from Piccirello/tom_organize_assets 

Organize WebUI assets
adaptive-webui-19844
Vladimir Golovnev 5 years ago committed by GitHub
parent
146ef69346 085ae05f19
commit
2cac830749
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 68 additions and 85 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 61
      src/webui/www/private/preferences.html
  2. 10
      src/webui/www/private/scripts/client.js
  3. 10
      src/webui/www/private/scripts/mocha-init.js
  4. 0
      src/webui/www/private/views/about.html
  5. 0
      src/webui/www/private/views/aboutToolbar.html
  6. 0
      src/webui/www/private/views/filters.html
  7. 0
      src/webui/www/private/views/installsearchplugin.html
  8. 0
      src/webui/www/private/views/preferences.html
  9. 44
      src/webui/www/private/views/preferencesToolbar.html
  10. 0
      src/webui/www/private/views/properties.html
  11. 0
      src/webui/www/private/views/propertiesToolbar.html
  12. 2
      src/webui/www/private/views/search.html
  13. 2
      src/webui/www/private/views/searchplugins.html
  14. 0
      src/webui/www/private/views/statistics.html
  15. 0
      src/webui/www/private/views/transferlist.html
  16. 24
      src/webui/www/webui.qrc

61
src/webui/www/private/preferences.html
Unescape View File

@ -1,61 +0,0 @@
<!DOCTYPE html>
<html lang="${LANG}">
<head>
<meta charset="UTF-8" />
<title>QBT_TR(Download from URLs)QBT_TR[CONTEXT=downloadFromURL]</title>
<link rel="stylesheet" href="css/style.css?v=${CACHEID}" type="text/css" />
<link rel="stylesheet" href="css/Tabs.css?v=${CACHEID}" type="text/css" />
<script src="scripts/lib/mootools-1.2-core-yc.js"></script>
<script src="scripts/lib/mootools-1.2-more.js"></script>
<script src="scripts/lib/mocha-0.9.6-yc.js"></script>
</head>
<body style="padding: 5px;">
<!-- preferences -->
<div class="toolbarTabs">
<ul id="preferencesTabs" class="tab-menu">
<li id="PrefDownloadsLink" class="selected"><a>QBT_TR(Downloads)QBT_TR[CONTEXT=OptionsDialog]</a></li>
<li id="PrefConnectionLink"><a>QBT_TR(Connection)QBT_TR[CONTEXT=OptionsDialog]</a></li>
<li id="PrefSpeedLink"><a>QBT_TR(Speed)QBT_TR[CONTEXT=OptionsDialog]</a></li>
<li id="PrefBittorrentLink"><a>QBT_TR(BitTorrent)QBT_TR[CONTEXT=OptionsDialog]</a></li>
<li id="PrefWebUILink"><a>QBT_TR(Web UI)QBT_TR[CONTEXT=OptionsDialog]</a></li>
<li id="PrefAdvancedLink"><a>QBT_TR(Advanced)QBT_TR[CONTEXT=OptionsDialog]</a></li>
</ul>
<div class="clear"></div>
</div>
<script>
'use strict';
// Tabs
MochaUI.initializeTabs('preferencesTabs');
$('PrefDownloadsLink').addEvent('click', function(e) {
$$('.PrefTab').addClass('invisible');
$('DownloadsTab').removeClass('invisible');
});
$('PrefConnectionLink').addEvent('click', function(e) {
$$('.PrefTab').addClass('invisible');
$('ConnectionTab').removeClass('invisible');
});
$('PrefSpeedLink').addEvent('click', function(e) {
$$('.PrefTab').addClass('invisible');
$('SpeedTab').removeClass('invisible');
});
$('PrefBittorrentLink').addEvent('click', function(e) {
$$('.PrefTab').addClass('invisible');
$('BittorrentTab').removeClass('invisible');
});
$('PrefWebUILink').addEvent('click', function(e) {
$$('.PrefTab').addClass('invisible');
$('WebUITab').removeClass('invisible');
});
$('PrefAdvancedLink').addEvent('click', function(e) {
$$('.PrefTab').addClass('invisible');
$('AdvancedTab').removeClass('invisible');
});
</script>
</body>
</html>

10
src/webui/www/private/scripts/client.js
Unescape View File

@ -223,7 +223,7 @@ window.addEvent('load', function() {
left: 0 left: 0
}, },
loadMethod: 'xhr', loadMethod: 'xhr',
contentURL: 'filters.html', contentURL: 'views/filters.html',
onContentLoaded: function() { onContentLoaded: function() {
setFilter(selected_filter); setFilter(selected_filter);
}, },
@ -826,7 +826,7 @@ window.addEvent('load', function() {
left: 0 left: 0
}, },
loadMethod: 'xhr', loadMethod: 'xhr',
contentURL: 'search.html', contentURL: 'views/search.html',
content: '', content: '',
column: 'searchTabColumn', column: 'searchTabColumn',
height: null height: null
@ -844,7 +844,7 @@ window.addEvent('load', function() {
left: 0 left: 0
}, },
loadMethod: 'xhr', loadMethod: 'xhr',
contentURL: 'transferlist.html', contentURL: 'views/transferlist.html',
onContentLoaded: function() { onContentLoaded: function() {
handleDownloadParam(); handleDownloadParam();
updateMainData(); updateMainData();
@ -868,12 +868,12 @@ window.addEvent('load', function() {
bottom: 0, bottom: 0,
left: 0 left: 0
}, },
contentURL: 'properties_content.html', contentURL: 'views/properties.html',
require: { require: {
css: ['css/Tabs.css', 'css/dynamicTable.css'], css: ['css/Tabs.css', 'css/dynamicTable.css'],
js: ['scripts/prop-general.js', 'scripts/prop-trackers.js', 'scripts/prop-peers.js', 'scripts/prop-webseeds.js', 'scripts/prop-files.js'], js: ['scripts/prop-general.js', 'scripts/prop-trackers.js', 'scripts/prop-peers.js', 'scripts/prop-webseeds.js', 'scripts/prop-files.js'],
}, },
tabsURL: 'properties.html', tabsURL: 'views/propertiesToolbar.html',
tabsOnload: function() { tabsOnload: function() {
MochaUI.initializeTabs('propertiesTabs'); MochaUI.initializeTabs('propertiesTabs');

10
src/webui/www/private/scripts/mocha-init.js
Unescape View File

@ -169,11 +169,11 @@ const initializeWindows = function() {
title: "QBT_TR(Options)QBT_TR[CONTEXT=OptionsDialog]", title: "QBT_TR(Options)QBT_TR[CONTEXT=OptionsDialog]",
loadMethod: 'xhr', loadMethod: 'xhr',
toolbar: true, toolbar: true,
contentURL: 'preferences_content.html', contentURL: 'views/preferences.html',
require: { require: {
css: ['css/Tabs.css'] css: ['css/Tabs.css']
}, },
toolbarURL: 'preferences.html', toolbarURL: 'views/preferencesToolbar.html',
maximizable: false, maximizable: false,
closable: true, closable: true,
paddingVertical: 0, paddingVertical: 0,
@ -362,7 +362,7 @@ const initializeWindows = function() {
id: id, id: id,
title: 'QBT_TR(Statistics)QBT_TR[CONTEXT=StatsDialog]', title: 'QBT_TR(Statistics)QBT_TR[CONTEXT=StatsDialog]',
loadMethod: 'xhr', loadMethod: 'xhr',
contentURL: 'statistics.html', contentURL: 'views/statistics.html',
maximizable: false, maximizable: false,
padding: 10, padding: 10,
width: loadWindowWidth(id, 275), width: loadWindowWidth(id, 275),
@ -920,12 +920,12 @@ const initializeWindows = function() {
id: id, id: id,
title: 'QBT_TR(About qBittorrent)QBT_TR[CONTEXT=AboutDialog]', title: 'QBT_TR(About qBittorrent)QBT_TR[CONTEXT=AboutDialog]',
loadMethod: 'xhr', loadMethod: 'xhr',
contentURL: 'about.html', contentURL: 'views/about.html',
require: { require: {
css: ['css/Tabs.css'] css: ['css/Tabs.css']
}, },
toolbar: true, toolbar: true,
toolbarURL: 'aboutToolbar.html', toolbarURL: 'views/aboutToolbar.html',
padding: 10, padding: 10,
width: loadWindowWidth(id, 550), width: loadWindowWidth(id, 550),
height: loadWindowHeight(id, 360), height: loadWindowHeight(id, 360),

0
src/webui/www/private/about.html → src/webui/www/private/views/about.html
Unescape View File

0
src/webui/www/private/aboutToolbar.html → src/webui/www/private/views/aboutToolbar.html
Unescape View File

0
src/webui/www/private/filters.html → src/webui/www/private/views/filters.html
Unescape View File

0
src/webui/www/private/installsearchplugin.html → src/webui/www/private/views/installsearchplugin.html
Unescape View File

0
src/webui/www/private/preferences_content.html → src/webui/www/private/views/preferences.html
Unescape View File

44
src/webui/www/private/views/preferencesToolbar.html
Unescape View File

@ -0,0 +1,44 @@
<!-- preferences -->
<div class="toolbarTabs">
<ul id="preferencesTabs" class="tab-menu">
<li id="PrefDownloadsLink" class="selected"><a>QBT_TR(Downloads)QBT_TR[CONTEXT=OptionsDialog]</a></li>
<li id="PrefConnectionLink"><a>QBT_TR(Connection)QBT_TR[CONTEXT=OptionsDialog]</a></li>
<li id="PrefSpeedLink"><a>QBT_TR(Speed)QBT_TR[CONTEXT=OptionsDialog]</a></li>
<li id="PrefBittorrentLink"><a>QBT_TR(BitTorrent)QBT_TR[CONTEXT=OptionsDialog]</a></li>
<li id="PrefWebUILink"><a>QBT_TR(Web UI)QBT_TR[CONTEXT=OptionsDialog]</a></li>
<li id="PrefAdvancedLink"><a>QBT_TR(Advanced)QBT_TR[CONTEXT=OptionsDialog]</a></li>
</ul>
<div class="clear"></div>
</div>
<script>
'use strict';
// Tabs
MochaUI.initializeTabs('preferencesTabs');
$('PrefDownloadsLink').addEvent('click', function(e) {
$$('.PrefTab').addClass('invisible');
$('DownloadsTab').removeClass('invisible');
});
$('PrefConnectionLink').addEvent('click', function(e) {
$$('.PrefTab').addClass('invisible');
$('ConnectionTab').removeClass('invisible');
});
$('PrefSpeedLink').addEvent('click', function(e) {
$$('.PrefTab').addClass('invisible');
$('SpeedTab').removeClass('invisible');
});
$('PrefBittorrentLink').addEvent('click', function(e) {
$$('.PrefTab').addClass('invisible');
$('BittorrentTab').removeClass('invisible');
});
$('PrefWebUILink').addEvent('click', function(e) {
$$('.PrefTab').addClass('invisible');
$('WebUITab').removeClass('invisible');
});
$('PrefAdvancedLink').addEvent('click', function(e) {
$$('.PrefTab').addClass('invisible');
$('AdvancedTab').removeClass('invisible');
});
</script>

0
src/webui/www/private/properties_content.html → src/webui/www/private/views/properties.html
Unescape View File

0
src/webui/www/private/properties.html → src/webui/www/private/views/propertiesToolbar.html
Unescape View File

2
src/webui/www/private/search.html → src/webui/www/private/views/search.html
Unescape View File

@ -350,7 +350,7 @@
id: id, id: id,
title: "QBT_TR(Search plugins)QBT_TR[CONTEXT=PluginSelectDlg]", title: "QBT_TR(Search plugins)QBT_TR[CONTEXT=PluginSelectDlg]",
loadMethod: 'xhr', loadMethod: 'xhr',
contentURL: 'searchplugins.html', contentURL: 'views/searchplugins.html',
scrollbars: false, scrollbars: false,
maximizable: false, maximizable: false,
paddingVertical: 0, paddingVertical: 0,

2
src/webui/www/private/searchplugins.html → src/webui/www/private/views/searchplugins.html
Unescape View File

@ -106,7 +106,7 @@
id: 'installSearchPlugin', id: 'installSearchPlugin',
title: "QBT_TR(Install plugin)QBT_TR[CONTEXT=PluginSourceDlg]", title: "QBT_TR(Install plugin)QBT_TR[CONTEXT=PluginSourceDlg]",
loadMethod: 'xhr', loadMethod: 'xhr',
contentURL: 'installsearchplugin.html', contentURL: 'views/installsearchplugin.html',
scrollbars: false, scrollbars: false,
resizable: false, resizable: false,
maximizable: false, maximizable: false,

0
src/webui/www/private/statistics.html → src/webui/www/private/views/statistics.html
Unescape View File

0
src/webui/www/private/transferlist.html → src/webui/www/private/views/transferlist.html
Unescape View File

24
src/webui/www/webui.qrc
Unescape View File

@ -1,7 +1,5 @@
<RCC> <RCC>
<qresource prefix="/www"> <qresource prefix="/www">
<file>private/about.html</file>
<file>private/aboutToolbar.html</file>
<file>private/addpeers.html</file> <file>private/addpeers.html</file>
<file>private/addtrackers.html</file> <file>private/addtrackers.html</file>
<file>private/confirmdeletion.html</file> <file>private/confirmdeletion.html</file>
@ -15,18 +13,10 @@
<file>private/download.html</file> <file>private/download.html</file>
<file>private/downloadlimit.html</file> <file>private/downloadlimit.html</file>
<file>private/edittracker.html</file> <file>private/edittracker.html</file>
<file>private/filters.html</file>
<file>private/index.html</file> <file>private/index.html</file>
<file>private/installsearchplugin.html</file>
<file>private/newcategory.html</file> <file>private/newcategory.html</file>
<file>private/newtag.html</file> <file>private/newtag.html</file>
<file>private/preferences.html</file>
<file>private/preferences_content.html</file>
<file>private/properties.html</file>
<file>private/properties_content.html</file>
<file>private/rename.html</file> <file>private/rename.html</file>
<file>private/search.html</file>
<file>private/searchplugins.html</file>
<file>private/scripts/client.js</file> <file>private/scripts/client.js</file>
<file>private/scripts/contextmenu.js</file> <file>private/scripts/contextmenu.js</file>
<file>private/scripts/download.js</file> <file>private/scripts/download.js</file>
@ -48,10 +38,20 @@
<file>private/scripts/speedslider.js</file> <file>private/scripts/speedslider.js</file>
<file>private/setlocation.html</file> <file>private/setlocation.html</file>
<file>private/shareratio.html</file> <file>private/shareratio.html</file>
<file>private/statistics.html</file>
<file>private/transferlist.html</file>
<file>private/upload.html</file> <file>private/upload.html</file>
<file>private/uploadlimit.html</file> <file>private/uploadlimit.html</file>
<file>private/views/about.html</file>
<file>private/views/aboutToolbar.html</file>
<file>private/views/filters.html</file>
<file>private/views/installsearchplugin.html</file>
<file>private/views/preferences.html</file>
<file>private/views/preferencesToolbar.html</file>
<file>private/views/properties.html</file>
<file>private/views/propertiesToolbar.html</file>
<file>private/views/search.html</file>
<file>private/views/searchplugins.html</file>
<file>private/views/statistics.html</file>
<file>private/views/transferlist.html</file>
<file>public/css/login.css</file> <file>public/css/login.css</file>
<file>public/css/noscript.css</file> <file>public/css/noscript.css</file>
<file>public/index.html</file> <file>public/index.html</file>

Write Preview
Loading…
Cancel
Save