summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--locale/cli.pot90
-rw-r--r--locale/core.pot285
-rw-r--r--locale/plugins.pot408
-rw-r--r--locale/setup.pot2
-rw-r--r--locale/webUI.pot35
-rw-r--r--pavement.py70
-rw-r--r--pyload/web/app/scripts/helpers/formatSize.js7
-rw-r--r--pyload/web/app/scripts/views/accounts/accountView.js3
-rw-r--r--pyload/web/app/styles/default/accounts.less6
-rw-r--r--pyload/web/app/styles/default/dashboard.less5
-rw-r--r--pyload/web/app/styles/default/style.less49
-rw-r--r--pyload/web/app/templates/default/accounts/account.html25
-rw-r--r--pyload/web/app/templates/default/accounts/actionbar.html10
-rw-r--r--pyload/web/app/templates/default/accounts/layout.html27
-rw-r--r--pyload/web/app/templates/default/dashboard/actionbar.html7
-rw-r--r--pyload/web/app/templates/default/dashboard/select.html2
16 files changed, 535 insertions, 496 deletions
diff --git a/locale/cli.pot b/locale/cli.pot
index c85472cd2..bd3faeff7 100644
--- a/locale/cli.pot
+++ b/locale/cli.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pyload 0.4.9.9-dev\n"
"Report-Msgid-Bugs-To: 'bugs@pyload.org'\n"
-"POT-Creation-Date: 2013-07-17 15:39+0200\n"
+"POT-Creation-Date: 2013-08-09 21:59+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -47,50 +47,6 @@ msgstr ""
msgid " back to main menu"
msgstr ""
-#: pyload/cli/ManageFiles.py:97
-msgid "Manage Packages:"
-msgstr ""
-
-#: pyload/cli/ManageFiles.py:99
-msgid "Manage Links:"
-msgstr ""
-
-#: pyload/cli/ManageFiles.py:104
-msgid "What do you want to move?"
-msgstr ""
-
-#: pyload/cli/ManageFiles.py:106
-msgid "What do you want to delete?"
-msgstr ""
-
-#: pyload/cli/ManageFiles.py:108
-msgid "What do you want to restart?"
-msgstr ""
-
-#: pyload/cli/ManageFiles.py:113
-msgid "Choose what you want to do, or enter package number."
-msgstr ""
-
-#: pyload/cli/ManageFiles.py:115
-msgid "delete"
-msgstr ""
-
-#: pyload/cli/ManageFiles.py:115
-msgid "move"
-msgstr ""
-
-#: pyload/cli/ManageFiles.py:115
-msgid "restart"
-msgstr ""
-
-#: pyload/cli/ManageFiles.py:148
-msgid " - previous"
-msgstr ""
-
-#: pyload/cli/ManageFiles.py:148
-msgid " - next"
-msgstr ""
-
#: pyload/cli/Cli.py:75 pyload/cli/Cli.py:133
msgid " Command Line Interface"
msgstr ""
@@ -293,3 +249,47 @@ msgstr ""
#: pyload/cli/Cli.py:582
msgid "Interactive mode ignored since you passed some commands."
msgstr ""
+
+#: pyload/cli/ManageFiles.py:97
+msgid "Manage Packages:"
+msgstr ""
+
+#: pyload/cli/ManageFiles.py:99
+msgid "Manage Links:"
+msgstr ""
+
+#: pyload/cli/ManageFiles.py:104
+msgid "What do you want to move?"
+msgstr ""
+
+#: pyload/cli/ManageFiles.py:106
+msgid "What do you want to delete?"
+msgstr ""
+
+#: pyload/cli/ManageFiles.py:108
+msgid "What do you want to restart?"
+msgstr ""
+
+#: pyload/cli/ManageFiles.py:113
+msgid "Choose what you want to do, or enter package number."
+msgstr ""
+
+#: pyload/cli/ManageFiles.py:115
+msgid "delete"
+msgstr ""
+
+#: pyload/cli/ManageFiles.py:115
+msgid "move"
+msgstr ""
+
+#: pyload/cli/ManageFiles.py:115
+msgid "restart"
+msgstr ""
+
+#: pyload/cli/ManageFiles.py:148
+msgid " - previous"
+msgstr ""
+
+#: pyload/cli/ManageFiles.py:148
+msgid " - next"
+msgstr ""
diff --git a/locale/core.pot b/locale/core.pot
index 05e49ac7f..9e3c3a60c 100644
--- a/locale/core.pot
+++ b/locale/core.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pyload 0.4.9.9-dev\n"
"Report-Msgid-Bugs-To: 'bugs@pyload.org'\n"
-"POT-Creation-Date: 2013-07-17 15:39+0200\n"
+"POT-Creation-Date: 2013-08-09 21:59+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,6 +17,16 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#: pyload/AccountManager.py:49
+#, python-format
+msgid "Unknown account plugin %s"
+msgstr ""
+
+#: pyload/AccountManager.py:71
+#, python-format
+msgid "Could not load account %s"
+msgstr ""
+
#: pyload/AddonManager.py:62
#, python-format
msgid "Error when executing %s"
@@ -45,33 +55,19 @@ msgstr ""
msgid "Deactivating Plugins..."
msgstr ""
-#: pyload/web/ServerThread.py:49
-msgid "SSL certificates not found."
-msgstr ""
-
-#: pyload/web/ServerThread.py:53
-msgid "WebUI built is not available"
-msgstr ""
-
-#: pyload/web/ServerThread.py:55
-msgid "Running webUI in development mode"
-msgstr ""
-
-#: pyload/web/ServerThread.py:73
-msgid "Failed starting webserver: "
-msgstr ""
-
-#: pyload/web/ServerThread.py:107
-msgid "Failed importing webserver: "
+#: pyload/api/DownloadApi.py:44
+#, python-format
+msgid "Added package %(name)s as folder %(folder)s"
msgstr ""
-#: pyload/web/ServerThread.py:125
-msgid "This server offers no SSL, please consider using threaded instead"
+#: pyload/api/DownloadApi.py:95
+#, python-format
+msgid "Added %d links to package"
msgstr ""
-#: pyload/web/ServerThread.py:139
+#: pyload/Api.py:152
#, python-format
-msgid "Starting %(name)s webserver: %(host)s:%(port)d"
+msgid "User '%s' tries to log in"
msgstr ""
#: pyload/config/default.py:14
@@ -320,51 +316,82 @@ msgstr ""
msgid "Download Time"
msgstr ""
-#: pyload/network/HTTPDownload.py:249
-#, python-format
-msgid "Download chunks failed, fallback to single connection | %s"
+#: pyload/Core.py:195
+msgid "Received Quit signal"
msgstr ""
-#: pyload/api/DownloadApi.py:44
+#: pyload/Core.py:323
#, python-format
-msgid "Added package %(name)s as folder %(folder)s"
+msgid "pyLoad already running with pid %s"
msgstr ""
-#: pyload/api/DownloadApi.py:95
+#: pyload/Core.py:337
#, python-format
-msgid "Added %d links to package"
+msgid "Failed changing group: %s"
msgstr ""
-#: pyload/AccountManager.py:69
+#: pyload/Core.py:347
#, python-format
-msgid "Unknown account plugin %s"
+msgid "Failed changing user: %s"
msgstr ""
-#: pyload/interaction/InteractionManager.py:88
-msgid "Query"
+#: pyload/Core.py:358
+msgid "Starting"
msgstr ""
-#: pyload/interaction/InteractionManager.py:111
-msgid "Captcha request"
+#: pyload/Core.py:359
+#, python-format
+msgid "Using home directory: %s"
msgstr ""
-#: pyload/interaction/InteractionManager.py:111
-msgid "Please solve the captcha."
+#: pyload/Core.py:373
+msgid "All links removed"
msgstr ""
-#: pyload/remote/RemoteManager.py:35
+#: pyload/Core.py:403
#, python-format
-msgid "Remote backend error: %s"
+msgid "Download time: %s"
msgstr ""
-#: pyload/remote/RemoteManager.py:80
+#: pyload/Core.py:418
#, python-format
-msgid "Starting %(name)s: %(addr)s:%(port)s"
+msgid "Free space: %s"
msgstr ""
-#: pyload/remote/RemoteManager.py:82
-#, python-format
-msgid "Failed loading backend %(name)s | %(error)s"
+#: pyload/Core.py:438
+msgid "Activating Accounts..."
+msgstr ""
+
+#: pyload/Core.py:443
+msgid "Restarting failed downloads..."
+msgstr ""
+
+#: pyload/Core.py:451
+msgid "pyLoad is up and running"
+msgstr ""
+
+#: pyload/Core.py:474
+msgid "restarting pyLoad"
+msgstr ""
+
+#: pyload/Core.py:478
+msgid "pyLoad quits"
+msgstr ""
+
+#: pyload/Core.py:564
+msgid "shutting down..."
+msgstr ""
+
+#: pyload/Core.py:579
+msgid "error while shutting down"
+msgstr ""
+
+#: pyload/Core.py:661
+msgid "killed pyLoad from terminal"
+msgstr ""
+
+#: pyload/database/DatabaseBackend.py:167
+msgid "Database was deleted due to incompatible version."
msgstr ""
#: pyload/FileManager.py:53
@@ -440,87 +467,45 @@ msgstr ""
msgid "Package finished: %s"
msgstr ""
-#: pyload/Api.py:152
-#, python-format
-msgid "User '%s' tries to log in"
+#: pyload/interaction/InteractionManager.py:88
+msgid "Query"
msgstr ""
-#: pyload/Core.py:195
-msgid "Received Quit signal"
+#: pyload/interaction/InteractionManager.py:111
+msgid "Captcha request"
msgstr ""
-#: pyload/Core.py:323
-#, python-format
-msgid "pyLoad already running with pid %s"
+#: pyload/interaction/InteractionManager.py:111
+msgid "Please solve the captcha."
msgstr ""
-#: pyload/Core.py:337
+#: pyload/network/HTTPDownload.py:249
#, python-format
-msgid "Failed changing group: %s"
+msgid "Download chunks failed, fallback to single connection | %s"
msgstr ""
-#: pyload/Core.py:347
+#: pyload/PluginManager.py:316
#, python-format
-msgid "Failed changing user: %s"
-msgstr ""
-
-#: pyload/Core.py:358
-msgid "Starting"
+msgid "Error importing %(name)s: %(msg)s"
msgstr ""
-#: pyload/Core.py:359
+#: pyload/remote/RemoteManager.py:35
#, python-format
-msgid "Using home directory: %s"
-msgstr ""
-
-#: pyload/Core.py:373
-msgid "All links removed"
+msgid "Remote backend error: %s"
msgstr ""
-#: pyload/Core.py:403
+#: pyload/remote/RemoteManager.py:80
#, python-format
-msgid "Download time: %s"
+msgid "Starting %(name)s: %(addr)s:%(port)s"
msgstr ""
-#: pyload/Core.py:418
+#: pyload/remote/RemoteManager.py:82
#, python-format
-msgid "Free space: %s"
-msgstr ""
-
-#: pyload/Core.py:438
-msgid "Activating Accounts..."
-msgstr ""
-
-#: pyload/Core.py:443
-msgid "Restarting failed downloads..."
-msgstr ""
-
-#: pyload/Core.py:451
-msgid "pyLoad is up and running"
-msgstr ""
-
-#: pyload/Core.py:474
-msgid "restarting pyLoad"
-msgstr ""
-
-#: pyload/Core.py:478
-msgid "pyLoad quits"
-msgstr ""
-
-#: pyload/Core.py:564
-msgid "shutting down..."
-msgstr ""
-
-#: pyload/Core.py:579
-msgid "error while shutting down"
-msgstr ""
-
-#: pyload/Core.py:661
-msgid "killed pyLoad from terminal"
+msgid "Failed loading backend %(name)s | %(error)s"
msgstr ""
-#: pyload/database/DatabaseBackend.py:167
-msgid "Database was deleted due to incompatible version."
+#: pyload/threads/AddonThread.py:55
+msgid "An Error occurred"
msgstr ""
#: pyload/threads/DecrypterThread.py:50
@@ -536,37 +521,6 @@ msgstr ""
msgid "No links decrypted"
msgstr ""
-#: pyload/threads/InfoThread.py:147
-#, python-format
-msgid "Info Fetching for %(name)s failed | %(err)s"
-msgstr ""
-
-#: pyload/threads/ThreadManager.py:155
-#, python-format
-msgid "Reconnect Failed: %s"
-msgstr ""
-
-#: pyload/threads/ThreadManager.py:192
-msgid "Reconnect script not found!"
-msgstr ""
-
-#: pyload/threads/ThreadManager.py:198
-msgid "Starting reconnect"
-msgstr ""
-
-#: pyload/threads/ThreadManager.py:212
-msgid "Failed executing reconnect script!"
-msgstr ""
-
-#: pyload/threads/ThreadManager.py:224
-#, python-format
-msgid "Reconnected, new IP: %s"
-msgstr ""
-
-#: pyload/threads/ThreadManager.py:298
-msgid "Not enough space left on device"
-msgstr ""
-
#: pyload/threads/DownloadThread.py:64
#, python-format
msgid "Download starts: %s"
@@ -621,13 +575,35 @@ msgstr ""
msgid "Internal Server Error"
msgstr ""
-#: pyload/threads/AddonThread.py:55
-msgid "An Error occurred"
+#: pyload/threads/InfoThread.py:147
+#, python-format
+msgid "Info Fetching for %(name)s failed | %(err)s"
msgstr ""
-#: pyload/PluginManager.py:316
+#: pyload/threads/ThreadManager.py:155
#, python-format
-msgid "Error importing %(name)s: %(msg)s"
+msgid "Reconnect Failed: %s"
+msgstr ""
+
+#: pyload/threads/ThreadManager.py:192
+msgid "Reconnect script not found!"
+msgstr ""
+
+#: pyload/threads/ThreadManager.py:198
+msgid "Starting reconnect"
+msgstr ""
+
+#: pyload/threads/ThreadManager.py:212
+msgid "Failed executing reconnect script!"
+msgstr ""
+
+#: pyload/threads/ThreadManager.py:224
+#, python-format
+msgid "Reconnected, new IP: %s"
+msgstr ""
+
+#: pyload/threads/ThreadManager.py:298
+msgid "Not enough space left on device"
msgstr ""
#: pyload/utils/JsEngine.py:188
@@ -635,3 +611,32 @@ msgid ""
"No js engine detected, please install either Spidermonkey, ossp-js, pyv8, "
"nodejs or rhino"
msgstr ""
+
+#: pyload/web/ServerThread.py:49
+msgid "SSL certificates not found."
+msgstr ""
+
+#: pyload/web/ServerThread.py:53
+msgid "WebUI built is not available"
+msgstr ""
+
+#: pyload/web/ServerThread.py:55
+msgid "Running webUI in development mode"
+msgstr ""
+
+#: pyload/web/ServerThread.py:73
+msgid "Failed starting webserver: "
+msgstr ""
+
+#: pyload/web/ServerThread.py:107
+msgid "Failed importing webserver: "
+msgstr ""
+
+#: pyload/web/ServerThread.py:125
+msgid "This server offers no SSL, please consider using threaded instead"
+msgstr ""
+
+#: pyload/web/ServerThread.py:139
+#, python-format
+msgid "Starting %(name)s webserver: %(host)s:%(port)d"
+msgstr ""
diff --git a/locale/plugins.pot b/locale/plugins.pot
index 94daadf07..e1601df95 100644
--- a/locale/plugins.pot
+++ b/locale/plugins.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pyload 0.4.9.9-dev\n"
"Report-Msgid-Bugs-To: 'bugs@pyload.org'\n"
-"POT-Creation-Date: 2013-07-20 22:13+0200\n"
+"POT-Creation-Date: 2013-08-09 21:59+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,273 +17,240 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: pyload/plugins/network/CurlDownload.py:241
+#: pyload/plugins/Account.py:140 pyload/plugins/Account.py:146
#, python-format
-msgid "Download chunks failed, fallback to single connection | %s"
+msgid "Could not login with account %(user)s | %(msg)s"
msgstr ""
-#: pyload/plugins/Base.py:329
-msgid ""
-"Pil and tesseract not installed and no Client connected for captcha "
-"decrypting"
+#: pyload/plugins/Account.py:141
+msgid "Wrong Password"
msgstr ""
-#: pyload/plugins/Base.py:333
-msgid "No captcha result obtained in appropriate time."
+#: pyload/plugins/Account.py:202
+#, python-format
+msgid "Get Account Info for %s"
msgstr ""
-#: pyload/plugins/Hoster.py:282 pyload/plugins/Hoster.py:319
-#: pyload/plugins/hoster/ARD.py:76
+#: pyload/plugins/Account.py:211
#, python-format
-msgid "Setting User and Group failed: %s"
+msgid "Error: %s"
msgstr ""
-#: pyload/plugins/Crypter.py:136
-msgid "Not existing file or unsupported protocol"
+#: pyload/plugins/Account.py:262
+#, python-format
+msgid "Your Time %s has a wrong format, use: 1:22-3:44"
msgstr ""
-#: pyload/plugins/hoster/RapidshareCom.py:96
-msgid "Rapidshare: Traffic Share (direct download)"
+#: pyload/plugins/Account.py:285
+#, python-format
+msgid "Account %s has not enough traffic, checking again in 30min"
msgstr ""
-#: pyload/plugins/hoster/RapidshareCom.py:123
-#: pyload/plugins/hoster/RapidshareCom.py:189
-msgid "Already downloading from this ip address, waiting 60 seconds"
+#: pyload/plugins/Account.py:293
+#, python-format
+msgid "Account %s is expired, checking again in 1h"
msgstr ""
-#: pyload/plugins/hoster/RapidshareCom.py:127
-msgid "Invalid Auth Code, download will be restarted"
+#: pyload/plugins/Account.py:310
+#, python-format
+msgid "Login with %s"
msgstr ""
-#: pyload/plugins/hoster/RapidshareCom.py:193
-msgid "RapidShareCom: No free slots"
+#: pyload/plugins/accounts/BitshareCom.py:37
+msgid "Activate direct Download in your Bitshare Account"
msgstr ""
-#: pyload/plugins/hoster/RapidshareCom.py:196
-msgid "You need a premium account for this file"
+#: pyload/plugins/Addon.py:118
+#, python-format
+msgid "Error executing addons: %s"
msgstr ""
-#: pyload/plugins/hoster/RapidshareCom.py:198
-msgid "Filename reported invalid"
+#: pyload/plugins/addons/Captcha9kw.py:58
+#: pyload/plugins/addons/CaptchaTrader.py:69
+#: pyload/plugins/addons/ExpertDecoders.py:50
+#, python-format
+msgid "%s credits left"
msgstr ""
-#: pyload/plugins/hoster/RealdebridCom.py:40
-#: pyload/plugins/hoster/Premium4Me.py:27
-#: pyload/plugins/hoster/MultiDebridCom.py:39
-#: pyload/plugins/hoster/ZeveraCom.py:24
-#: pyload/plugins/hoster/AlldebridCom.py:37
-#: pyload/plugins/hoster/RehostTo.py:25 pyload/plugins/hoster/ReloadCc.py:22
-#: pyload/plugins/hoster/DebridItaliaCom.py:38
-#: pyload/plugins/hoster/PremiumizeMe.py:19
+#: pyload/plugins/addons/Captcha9kw.py:91
#, python-format
-msgid "Please enter your %s account or deactivate this plugin"
+msgid "New CaptchaID from upload: %s : %s"
msgstr ""
-#: pyload/plugins/hoster/MegaNz.py:55
-msgid "Decryption failed"
+#: pyload/plugins/addons/Captcha9kw.py:127
+msgid "Your Captcha 9kw.eu Account has not enough credits"
msgstr ""
-#: pyload/plugins/hoster/MegaNz.py:99
-msgid "No file key provided in the URL"
+#: pyload/plugins/addons/CaptchaBrotherhood.py:69
+#, python-format
+msgid "%d credits left"
msgstr ""
-#: pyload/plugins/hoster/MegaNz.py:111
-msgid "Error code:"
+#: pyload/plugins/addons/CaptchaTrader.py:117
+msgid "Could not send response."
msgstr ""
-#: pyload/plugins/hoster/FileserveCom.py:97
-msgid "Parallel download error, now waiting 60s."
+#: pyload/plugins/addons/CaptchaTrader.py:135
+msgid "Your CaptchaTrader Account has not enough credits"
msgstr ""
-#: pyload/plugins/hoster/FileserveCom.py:208
-msgid "Not logged in."
+#: pyload/plugins/addons/ClickAndLoad.py:75
+msgid "Click'N'Load: Port 9666 already in use"
msgstr ""
-#: pyload/plugins/hoster/UploadedTo.py:135
-msgid "API key invalid"
+#: pyload/plugins/addons/ExpertDecoders.py:95
+msgid "Your ExpertDecoders Account has not enough credits"
msgstr ""
-#: pyload/plugins/hoster/UploadedTo.py:160
+#: pyload/plugins/addons/ExternalScripts.py:53
#, python-format
-msgid "%s: Not enough traffic left"
-msgstr ""
-
-#: pyload/plugins/hoster/UploadedTo.py:163
-msgid "Traffic exceeded"
-msgstr ""
-
-#: pyload/plugins/hoster/BasePlugin.py:63
-msgid "Authorization required (username:password)"
+msgid "Installed scripts for %s: "
msgstr ""
-#: pyload/plugins/hoster/NetloadIn.py:143
-#: pyload/plugins/hoster/NetloadIn.py:167
-msgid "File temporarily not available"
+#: pyload/plugins/addons/ExternalScripts.py:68
+msgid "Script not executable:"
msgstr ""
-#: pyload/plugins/hoster/NetloadIn.py:180
+#: pyload/plugins/addons/ExternalScripts.py:78
#, python-format
-msgid "Netload: waiting between downloads %d s."
+msgid "Error in %(script)s: %(error)s"
msgstr ""
-#: pyload/plugins/hoster/NetloadIn.py:209
+#: pyload/plugins/addons/ExtractArchive.py:93
#, python-format
-msgid "Netload: waiting for captcha %d s."
-msgstr ""
-
-#: pyload/plugins/hoster/NetloadIn.py:248
-msgid "Downloaded File was empty"
+msgid "No %s installed"
msgstr ""
-#: pyload/plugins/hoster/FilesMailRu.py:98
+#: pyload/plugins/addons/ExtractArchive.py:95
+#: pyload/plugins/addons/ExtractArchive.py:100
#, python-format
-msgid ""
-"There was HTML Code in the Downloaded File(%s)...redirect error? The "
-"Download will be restarted."
+msgid "Could not activate %s"
msgstr ""
-#: pyload/plugins/hoster/XHamsterCom.py:75
-#: pyload/plugins/hoster/XHamsterCom.py:84
-#: pyload/plugins/hoster/XHamsterCom.py:87
-#, python-format
-msgid "long_url: %s"
+#: pyload/plugins/addons/ExtractArchive.py:105
+msgid "Activated"
msgstr ""
-#: pyload/plugins/Account.py:117 pyload/plugins/Account.py:123
-#, python-format
-msgid "Could not login with account %(user)s | %(msg)s"
+#: pyload/plugins/addons/ExtractArchive.py:107
+msgid "No Extract plugins activated"
msgstr ""
-#: pyload/plugins/Account.py:118
-msgid "Wrong Password"
+#: pyload/plugins/addons/ExtractArchive.py:119
+#, python-format
+msgid "Package %s queued for later extracting"
msgstr ""
-#: pyload/plugins/Account.py:184
+#: pyload/plugins/addons/ExtractArchive.py:142
#, python-format
-msgid "Get Account Info for %s"
+msgid "Check package %s"
msgstr ""
-#: pyload/plugins/Account.py:193
+#: pyload/plugins/addons/ExtractArchive.py:183
#, python-format
-msgid "Error: %s"
+msgid "Extract to %s"
msgstr ""
-#: pyload/plugins/Account.py:242
-#, python-format
-msgid "Your Time %s has a wrong format, use: 1:22-3:44"
+#: pyload/plugins/addons/ExtractArchive.py:198
+msgid "No files found to extract"
msgstr ""
-#: pyload/plugins/Account.py:265
-#, python-format
-msgid "Account %s has not enough traffic, checking again in 30min"
+#: pyload/plugins/addons/ExtractArchive.py:205
+msgid "extracting"
msgstr ""
-#: pyload/plugins/Account.py:273
-#, python-format
-msgid "Account %s is expired, checking again in 1h"
+#: pyload/plugins/addons/ExtractArchive.py:216
+msgid "Password protected"
msgstr ""
-#: pyload/plugins/Account.py:290
-#, python-format
-msgid "Login with %s"
+#: pyload/plugins/addons/ExtractArchive.py:237
+msgid "Wrong password"
msgstr ""
-#: pyload/plugins/Addon.py:118
+#: pyload/plugins/addons/ExtractArchive.py:245
#, python-format
-msgid "Error executing addons: %s"
+msgid "Deleting %s files"
msgstr ""
-#: pyload/plugins/accounts/BitshareCom.py:36
-msgid "Activate direct Download in your Bitshare Account"
+#: pyload/plugins/addons/ExtractArchive.py:252
+msgid "Extracting finished"
msgstr ""
-#: pyload/plugins/crypter/SerienjunkiesOrg.py:128
-msgid "Downloadlimit reached"
+#: pyload/plugins/addons/ExtractArchive.py:258
+msgid "Archive Error"
msgstr ""
-#: pyload/plugins/addons/Premium4Me.py:30
-msgid "Please add your premium.to account first and restart pyLoad"
+#: pyload/plugins/addons/ExtractArchive.py:260
+msgid "CRC Mismatch"
msgstr ""
-#: pyload/plugins/addons/ExternalScripts.py:53
-#, python-format
-msgid "Installed scripts for %s: "
+#: pyload/plugins/addons/ExtractArchive.py:264
+msgid "Unknown Error"
msgstr ""
-#: pyload/plugins/addons/ExternalScripts.py:69
-msgid "Script not executable:"
+#: pyload/plugins/addons/ExtractArchive.py:316
+msgid "Setting User and Group failed"
msgstr ""
-#: pyload/plugins/addons/ExternalScripts.py:79
+#: pyload/plugins/addons/HotFolder.py:82
#, python-format
-msgid "Error in %(script)s: %(error)s"
+msgid "Added %s from HotFolder"
msgstr ""
-#: pyload/plugins/addons/CaptchaTrader.py:72
-#: pyload/plugins/addons/Captcha9kw.py:56
-#: pyload/plugins/addons/ExpertDecoders.py:49
+#: pyload/plugins/addons/IRCInterface.py:74
+#: pyload/plugins/addons/XMPPInterface.py:83
#, python-format
-msgid "%s credits left"
-msgstr ""
-
-#: pyload/plugins/addons/CaptchaTrader.py:120
-msgid "Could not send response."
-msgstr ""
-
-#: pyload/plugins/addons/CaptchaTrader.py:138
-msgid "Your CaptchaTrader Account has not enough credits"
+msgid "Package finished: %s"
msgstr ""
-#: pyload/plugins/addons/Captcha9kw.py:89
+#: pyload/plugins/addons/IRCInterface.py:82
#, python-format
-msgid "New CaptchaID from upload: %s : %s"
+msgid "Download finished: %(name)s @ %(plugin)s "
msgstr ""
-#: pyload/plugins/addons/Captcha9kw.py:123
-msgid "Your Captcha 9kw.eu Account has not enough credits"
+#: pyload/plugins/addons/IRCInterface.py:95
+#, python-format
+msgid "New Captcha Request: %s"
msgstr ""
-#: pyload/plugins/addons/RehostTo.py:34
-msgid "Please add your rehost.to account first and restart pyLoad"
+#: pyload/plugins/addons/IRCInterface.py:96
+#, python-format
+msgid "Answer with 'c %s text on the captcha'"
msgstr ""
-#: pyload/plugins/addons/HotFolder.py:82
-#, python-format
-msgid "Added %s from HotFolder"
+#: pyload/plugins/addons/LinkdecrypterCom.py:37
+msgid "Crypter list not found"
msgstr ""
-#: pyload/plugins/addons/ClickAndLoad.py:74
-msgid "Click'N'Load: Port 9666 already in use"
+#: pyload/plugins/addons/LinkdecrypterCom.py:51
+msgid "Crypter list is empty"
msgstr ""
-#: pyload/plugins/addons/XMPPInterface.py:82
-#: pyload/plugins/addons/IRCInterface.py:75
+#: pyload/plugins/addons/MultiHoster.py:29
#, python-format
-msgid "Package finished: %s"
+msgid "Activated %s"
msgstr ""
-#: pyload/plugins/addons/XMPPInterface.py:90
-#, python-format
-msgid "Download finished: %(name)s @ %(plugin)s"
+#: pyload/plugins/addons/MultiHoster.py:47
+msgid "No Hoster loaded"
msgstr ""
-#: pyload/plugins/addons/ExpertDecoders.py:98
-msgid "Your ExpertDecoders Account has not enough credits"
+#: pyload/plugins/addons/RehostTo.py:32
+msgid "Please add your rehost.to account first and restart pyLoad"
msgstr ""
-#: pyload/plugins/addons/UpdateManager.py:73
+#: pyload/plugins/addons/UpdateManager.py:74
msgid "*** Plugins have been updated, please restart pyLoad ***"
msgstr ""
-#: pyload/plugins/addons/UpdateManager.py:75
+#: pyload/plugins/addons/UpdateManager.py:76
msgid "Plugins updated and reloaded"
msgstr ""
-#: pyload/plugins/addons/UpdateManager.py:78
+#: pyload/plugins/addons/UpdateManager.py:79
msgid "No plugin updates available"
msgstr ""
-#: pyload/plugins/addons/UpdateManager.py:95
+#: pyload/plugins/addons/UpdateManager.py:96
msgid "No Updates for pyLoad"
msgstr ""
@@ -315,118 +282,145 @@ msgstr ""
msgid "Version mismatch"
msgstr ""
-#: pyload/plugins/addons/ExtractArchive.py:92
+#: pyload/plugins/addons/XMPPInterface.py:91
#, python-format
-msgid "No %s installed"
+msgid "Download finished: %(name)s @ %(plugin)s"
msgstr ""
-#: pyload/plugins/addons/ExtractArchive.py:94
-#: pyload/plugins/addons/ExtractArchive.py:99
-#, python-format
-msgid "Could not activate %s"
+#: pyload/plugins/Base.py:329
+msgid ""
+"Pil and tesseract not installed and no Client connected for captcha "
+"decrypting"
msgstr ""
-#: pyload/plugins/addons/ExtractArchive.py:104
-msgid "Activated"
+#: pyload/plugins/Base.py:333
+msgid "No captcha result obtained in appropriate time."
msgstr ""
-#: pyload/plugins/addons/ExtractArchive.py:106
-msgid "No Extract plugins activated"
+#: pyload/plugins/crypter/SerienjunkiesOrg.py:130
+msgid "Downloadlimit reached"
+msgstr ""
+
+#: pyload/plugins/Crypter.py:136
+msgid "Not existing file or unsupported protocol"
msgstr ""
-#: pyload/plugins/addons/ExtractArchive.py:118
+#: pyload/plugins/hoster/AlldebridCom.py:36
+#: pyload/plugins/hoster/DebridItaliaCom.py:38
+#: pyload/plugins/hoster/FastixRu.py:34
+#: pyload/plugins/hoster/MultiDebridCom.py:39
+#: pyload/plugins/hoster/Premium4Me.py:27
+#: pyload/plugins/hoster/PremiumizeMe.py:21
+#: pyload/plugins/hoster/RealdebridCom.py:40
+#: pyload/plugins/hoster/RehostTo.py:26 pyload/plugins/hoster/ReloadCc.py:24
+#: pyload/plugins/hoster/UnrestrictLi.py:51
+#: pyload/plugins/hoster/ZeveraCom.py:22
#, python-format
-msgid "Package %s queued for later extracting"
+msgid "Please enter your %s account or deactivate this plugin"
msgstr ""
-#: pyload/plugins/addons/ExtractArchive.py:143
+#: pyload/plugins/hoster/ARD.py:79 pyload/plugins/Hoster.py:278
+#: pyload/plugins/Hoster.py:315
#, python-format
-msgid "Check package %s"
+msgid "Setting User and Group failed: %s"
msgstr ""
-#: pyload/plugins/addons/ExtractArchive.py:183
+#: pyload/plugins/hoster/BasePlugin.py:64
+msgid "Authorization required (username:password)"
+msgstr ""
+
+#: pyload/plugins/hoster/FileserveCom.py:99
+msgid "Parallel download error, now waiting 60s."
+msgstr ""
+
+#: pyload/plugins/hoster/FileserveCom.py:215
+msgid "Not logged in."
+msgstr ""
+
+#: pyload/plugins/hoster/FilesMailRu.py:99
#, python-format
-msgid "Extract to %s"
+msgid ""
+"There was HTML Code in the Downloaded File (%s)...redirect error? The "
+"Download will be restarted."
msgstr ""
-#: pyload/plugins/addons/ExtractArchive.py:197
-msgid "No files found to extract"
+#: pyload/plugins/hoster/MegaNz.py:56
+msgid "Decryption failed"
msgstr ""
-#: pyload/plugins/addons/ExtractArchive.py:203
-msgid "extracting"
+#: pyload/plugins/hoster/MegaNz.py:101
+msgid "No file key provided in the URL"
msgstr ""
-#: pyload/plugins/addons/ExtractArchive.py:214
-msgid "Password protected"
+#: pyload/plugins/hoster/MegaNz.py:113
+msgid "Error code:"
msgstr ""
-#: pyload/plugins/addons/ExtractArchive.py:234
-msgid "Wrong password"
+#: pyload/plugins/hoster/NetloadIn.py:146
+#: pyload/plugins/hoster/NetloadIn.py:170
+msgid "File temporarily not available"
msgstr ""
-#: pyload/plugins/addons/ExtractArchive.py:242
+#: pyload/plugins/hoster/NetloadIn.py:183
#, python-format
-msgid "Deleting %s files"
+msgid "Netload: waiting between downloads %d s."
msgstr ""
-#: pyload/plugins/addons/ExtractArchive.py:247
-msgid "Extracting finished"
+#: pyload/plugins/hoster/NetloadIn.py:214
+#, python-format
+msgid "Netload: waiting for captcha %d s."
msgstr ""
-#: pyload/plugins/addons/ExtractArchive.py:254
-msgid "Archive Error"
+#: pyload/plugins/hoster/NetloadIn.py:252
+msgid "Downloaded File was empty"
msgstr ""
-#: pyload/plugins/addons/ExtractArchive.py:256
-msgid "CRC Mismatch"
+#: pyload/plugins/hoster/RapidshareCom.py:102
+msgid "Rapidshare: Traffic Share (direct download)"
msgstr ""
-#: pyload/plugins/addons/ExtractArchive.py:260
-msgid "Unknown Error"
+#: pyload/plugins/hoster/RapidshareCom.py:129
+#: pyload/plugins/hoster/RapidshareCom.py:197
+msgid "Already downloading from this ip address, waiting 60 seconds"
msgstr ""
-#: pyload/plugins/addons/ExtractArchive.py:312
-msgid "Setting User and Group failed"
+#: pyload/plugins/hoster/RapidshareCom.py:133
+msgid "Invalid Auth Code, download will be restarted"
msgstr ""
-#: pyload/plugins/addons/LinkdecrypterCom.py:36
-msgid "Crypter list not found"
+#: pyload/plugins/hoster/RapidshareCom.py:202
+msgid "RapidShareCom: No free slots"
msgstr ""
-#: pyload/plugins/addons/LinkdecrypterCom.py:50
-msgid "Crypter list is empty"
+#: pyload/plugins/hoster/RapidshareCom.py:205
+msgid "You need a premium account for this file"
msgstr ""
-#: pyload/plugins/addons/IRCInterface.py:82
-#, python-format
-msgid "Download finished: %(name)s @ %(plugin)s "
+#: pyload/plugins/hoster/RapidshareCom.py:207
+msgid "Filename reported invalid"
msgstr ""
-#: pyload/plugins/addons/IRCInterface.py:94
-#, python-format
-msgid "New Captcha Request: %s"
+#: pyload/plugins/hoster/UploadedTo.py:137
+msgid "API key invalid"
msgstr ""
-#: pyload/plugins/addons/IRCInterface.py:95
+#: pyload/plugins/hoster/UploadedTo.py:161
#, python-format
-msgid "Answer with 'c %s text on the captcha'"
+msgid "%s: Not enough traffic left"
msgstr ""
-#: pyload/plugins/addons/PremiumizeMe.py:46
-msgid "Please add a valid premiumize.me account first and restart pyLoad."
+#: pyload/plugins/hoster/UploadedTo.py:164
+msgid "Traffic exceeded"
msgstr ""
-#: pyload/plugins/addons/CaptchaBrotherhood.py:69
+#: pyload/plugins/hoster/XHamsterCom.py:77
+#: pyload/plugins/hoster/XHamsterCom.py:86
+#: pyload/plugins/hoster/XHamsterCom.py:89
#, python-format
-msgid "%d credits left"
+msgid "long_url: %s"
msgstr ""
-#: pyload/plugins/addons/MultiHoster.py:29
+#: pyload/plugins/network/CurlDownload.py:245
#, python-format
-msgid "Activated %s"
-msgstr ""
-
-#: pyload/plugins/addons/MultiHoster.py:47
-msgid "No Hoster loaded"
+msgid "Download chunks failed, fallback to single connection | %s"
msgstr ""
diff --git a/locale/setup.pot b/locale/setup.pot
index 4fd3ff31b..55de66c82 100644
--- a/locale/setup.pot
+++ b/locale/setup.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pyload 0.4.9.9-dev\n"
"Report-Msgid-Bugs-To: 'bugs@pyload.org'\n"
-"POT-Creation-Date: 2013-07-17 15:39+0200\n"
+"POT-Creation-Date: 2013-08-09 21:59+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/locale/webUI.pot b/locale/webUI.pot
new file mode 100644
index 000000000..59bf98dec
--- /dev/null
+++ b/locale/webUI.pot
@@ -0,0 +1,35 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR pyLoad Team
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: pyload 0.4.9.9-dev\n"
+"Report-Msgid-Bugs-To: 'bugs@pyload.org'\n"
+"POT-Creation-Date: 2013-08-09 21:59+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: pyload/web/app/scripts/helpers/formatSize.js:9
+msgid "not available"
+msgstr ""
+
+#: pyload/web/app/scripts/helpers/formatSize.js:11
+msgid "unlimited"
+msgstr ""
+
+#: pyload/web/app/templates/default/admin.html:3
+#: pyload/web/app/templates/default/admin.html:4
+msgid "Admin"
+msgstr ""
+
+#: pyload/web/app/templates/default/setup.html:3
+msgid "Setup"
+msgstr ""
diff --git a/pavement.py b/pavement.py
index e9a586a7c..ff9e61a9c 100644
--- a/pavement.py
+++ b/pavement.py
@@ -21,6 +21,7 @@ path.fnmatch = new_fnmatch
import os
import sys
import shutil
+import re
from glob import glob
from tempfile import mkdtemp
from subprocess import call, Popen
@@ -56,25 +57,27 @@ xargs = ["--language=Python", "--add-comments=L10N",
# Modules replace rules
module_replace = [
-('from module.plugins.Hoster import Hoster', 'from pyload.plugins.Hoster import Hoster'),
-('from module.plugins.Hook import threaded, Expose, Hook', 'from pyload.plugins.Addon import threaded, Expose, Addon'),
-('from module.plugins.Hook import Hook', 'from pyload.plugins.Addon import Addon'),
-('from module.common.json_layer import json_loads, json_dumps', 'from pyload.utils import json_loads, json_dumps'),
-('from module.common.json_layer import json_loads', 'from pyload.utils import json_loads'),
-('from module.common.json_layer import json_dumps', 'from pyload.utils import json_dumps'),
-('from module.utils import parseFileSize', 'from pyload.utils import parseFileSize'),
-('from module.utils import save_join, save_path', 'from pyload.utils.fs import save_join, save_filename as save_path'),
-('from module.utils import save_join, fs_encode', 'from pyload.utils.fs import save_join, fs_encode'),
-('from module.utils import save_join', 'from pyload.utils.fs import save_join'),
-('from module.utils import fs_encode', 'from pyload.utils.fs import fs_encode'),
-('from module.unescape import unescape', 'from pyload.utils import html_unescape as unescape'),
-('from module.lib.BeautifulSoup import BeautifulSoup', 'from BeautifulSoup import BeautifulSoup'),
-('from module.lib import feedparser', 'import feedparser'),
-('self.account.getAccountInfo(self.user, ', 'self.account.getAccountInfo('),
-('self.account.getAccountInfo(self.user)', 'self.account.getAccountInfo()'),
-('self.account.accounts[self.user]["password"]', 'self.account.password'),
-("self.account.accounts[self.user]['password']", 'self.account.password'),
-('from module.', 'from pyload.') # This should be always the last one
+ ('from module.plugins.Hoster import Hoster', 'from pyload.plugins.Hoster import Hoster'),
+ ('from module.plugins.Hook import threaded, Expose, Hook',
+ 'from pyload.plugins.Addon import threaded, Expose, Addon'),
+ ('from module.plugins.Hook import Hook', 'from pyload.plugins.Addon import Addon'),
+ ('from module.common.json_layer import json_loads, json_dumps', 'from pyload.utils import json_loads, json_dumps'),
+ ('from module.common.json_layer import json_loads', 'from pyload.utils import json_loads'),
+ ('from module.common.json_layer import json_dumps', 'from pyload.utils import json_dumps'),
+ ('from module.utils import parseFileSize', 'from pyload.utils import parseFileSize'),
+ ('from module.utils import save_join, save_path',
+ 'from pyload.utils.fs import save_join, save_filename as save_path'),
+ ('from module.utils import save_join, fs_encode', 'from pyload.utils.fs import save_join, fs_encode'),
+ ('from module.utils import save_join', 'from pyload.utils.fs import save_join'),
+ ('from module.utils import fs_encode', 'from pyload.utils.fs import fs_encode'),
+ ('from module.unescape import unescape', 'from pyload.utils import html_unescape as unescape'),
+ ('from module.lib.BeautifulSoup import BeautifulSoup', 'from BeautifulSoup import BeautifulSoup'),
+ ('from module.lib import feedparser', 'import feedparser'),
+ ('self.account.getAccountInfo(self.user, ', 'self.account.getAccountInfo('),
+ ('self.account.getAccountInfo(self.user)', 'self.account.getAccountInfo()'),
+ ('self.account.accounts[self.user]["password"]', 'self.account.password'),
+ ("self.account.accounts[self.user]['password']", 'self.account.password'),
+ ('from module.', 'from pyload.') # This should be always the last one
]
@@ -87,7 +90,6 @@ def html():
call_task('paver.doctools.html')
-
@task
@cmdopts([
('path=', 'p', 'Thrift path'),
@@ -140,7 +142,6 @@ def webapp():
@task
def generate_locale():
""" Generates localisation files """
- # TODO restructure, many references are outdated
EXCLUDE = ["pyload/lib", "pyload/cli", "pyload/setup", "pyload/plugins", "Setup.py"]
@@ -148,13 +149,14 @@ def generate_locale():
makepot("plugins", path("pyload") / "plugins")
makepot("setup", "", [], includes="./pyload/Setup.py\n")
makepot("cli", path("pyload") / "cli", [])
-
- # TODO: web ui
+ makepot("webUI", path("pyload") / "web" / "app", ["components", "vendor", "gettext"], endings=[".js", ".html"],
+ xxargs="--language=Python --force-po".split(" "))
path("includes.txt").remove()
print "Locale generated"
+
@task
@cmdopts([
('key=', 'k', 'api key')
@@ -182,6 +184,7 @@ def upload_translations(options):
print "Translations uploaded"
+
@task
@cmdopts([
('key=', 'k', 'api key')
@@ -218,6 +221,7 @@ def download_translations(options):
shutil.rmtree(tmp)
+
@task
def compile_translations():
""" Compile PO files to MO """
@@ -229,6 +233,7 @@ def compile_translations():
print "Compiling %s" % f
call(['msgfmt', '-o', f.replace('.po', '.mo'), f])
+
@task
def tests():
""" Run complete test suite """
@@ -289,12 +294,12 @@ def replace_module_imports():
#helper functions
-def walk_trans(path, EXCLUDE, endings=[".py"]):
+def walk_trans(path, excludes, endings=[".py"]):
result = ""
for f in path.walkfiles():
- if [True for x in EXCLUDE if x in f.dirname().relpath()]: continue
- if f.name in EXCLUDE: continue
+ if [True for x in excludes if x in f.dirname().relpath()]: continue
+ if f.name in excludes: continue
for e in endings:
if f.name.endswith(e):
@@ -327,16 +332,3 @@ def makepot(domain, p, excludes=[], includes="", endings=[".py"], xxargs=[]):
with open("locale/%s.pot" % domain, "wb") as f:
f.write(content)
-
-
-def change_owner(dir, uid, gid):
- for p in dir.walk():
- p.chown(uid, gid)
-
-
-def change_mode(dir, mode, folder=False):
- for p in dir.walk():
- if folder and p.isdir():
- p.chmod(mode)
- elif p.isfile() and not folder:
- p.chmod(mode)
diff --git a/pyload/web/app/scripts/helpers/formatSize.js b/pyload/web/app/scripts/helpers/formatSize.js
index 3b62e74c7..926c4793d 100644
--- a/pyload/web/app/scripts/helpers/formatSize.js
+++ b/pyload/web/app/scripts/helpers/formatSize.js
@@ -1,10 +1,15 @@
// Format bytes in human readable format
-define('helpers/formatSize', ['handlebars'], function(Handlebars) {
+define('helpers/formatSize', ['handlebars', './gettext'], function(Handlebars, gettext) {
'use strict';
var sizes = ['B', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB'];
function formatSize(bytes, options) {
if (!bytes || bytes === 0) return '0 B';
+ if (bytes === -1)
+ return gettext('not available');
+ if (bytes === -2)
+ return gettext('unlimited');
+
var i = parseInt(Math.floor(Math.log(bytes) / Math.log(1024)), 10);
// round to two digits
return (bytes / Math.pow(1024, i)).toFixed(2) + ' ' + sizes[i];
diff --git a/pyload/web/app/scripts/views/accounts/accountView.js b/pyload/web/app/scripts/views/accounts/accountView.js
index 89f69d7e7..7d1f04315 100644
--- a/pyload/web/app/scripts/views/accounts/accountView.js
+++ b/pyload/web/app/scripts/views/accounts/accountView.js
@@ -4,7 +4,8 @@ define(['jquery', 'underscore', 'backbone', 'app', 'hbs!tpl/accounts/account'],
return Backbone.Marionette.ItemView.extend({
- tagName: 'tr',
+ tagName: 'div',
+ className: 'row-fluid',
template: template,
events: {
diff --git a/pyload/web/app/styles/default/accounts.less b/pyload/web/app/styles/default/accounts.less
index 9b45b64b3..c388015b6 100644
--- a/pyload/web/app/styles/default/accounts.less
+++ b/pyload/web/app/styles/default/accounts.less
@@ -3,4 +3,10 @@
.logo-select {
width: 20px;
height: 20px;
+}
+
+.vertical-header {
+ .rotate(-90deg);
+ font-weight: bold;
+ text-transform: uppercase;
} \ No newline at end of file
diff --git a/pyload/web/app/styles/default/dashboard.less b/pyload/web/app/styles/default/dashboard.less
index ed87e19a1..336070737 100644
--- a/pyload/web/app/styles/default/dashboard.less
+++ b/pyload/web/app/styles/default/dashboard.less
@@ -309,6 +309,11 @@ FANCY CHECKBOXES
}
+.li-check > a {
+ padding-left: 8px !important;
+ padding-right: 8px !important;
+}
+
li.finished > a, li.finished:hover > a {
background-color: @green;
color: @light;
diff --git a/pyload/web/app/styles/default/style.less b/pyload/web/app/styles/default/style.less
index b75f45a65..b24e5ff21 100644
--- a/pyload/web/app/styles/default/style.less
+++ b/pyload/web/app/styles/default/style.less
@@ -174,8 +174,8 @@ header { // background-color: @greyDark;
float: right;
width: 100%;
.centered;
-// height: @header-height - 16px;
-// margin: 8px 0;
+ // height: @header-height - 16px;
+ // margin: 8px 0;
font-family: sans-serif;
}
}
@@ -240,36 +240,35 @@ header { // background-color: @greyDark;
padding-top: 2px;
margin-bottom: 5px;
-}
-
-.actionbar > li > a {
- margin-top: 4px;
-}
+ & > li > a, & > li > button {
+ margin-top: 4px;
+ }
-.actionbar .breadcrumb {
- margin: 0;
- padding-top: 10px;
- padding-bottom: 0;
+ .breadcrumb {
+ margin: 0;
+ padding-top: 10px;
+ padding-bottom: 0;
- .active {
- color: @grey;
+ .active {
+ color: @grey;
+ }
}
-}
+ form {
+ margin-top: 6px;
+ margin-bottom: 0;
+ }
-.actionbar form {
- margin-top: 6px;
- margin-bottom: 0;
-}
+ input, button {
+ padding-top: 2px;
+ padding-bottom: 2px;
+ }
-.actionbar input, .actionbar button {
- padding-top: 2px;
- padding-bottom: 2px;
-}
+ .dropdown-menu i {
+ margin-top: 4px;
+ padding-right: 5px;
+ }
-.actionbar .dropdown-menu i {
- margin-top: 4px;
- padding-right: 5px;
}
/*
diff --git a/pyload/web/app/templates/default/accounts/account.html b/pyload/web/app/templates/default/accounts/account.html
index 90bd632c8..927072350 100644
--- a/pyload/web/app/templates/default/accounts/account.html
+++ b/pyload/web/app/templates/default/accounts/account.html
@@ -1,10 +1,15 @@
-<td>{{ plugin }}</td>
-<td>{{ loginname }}</td>
-<td>{{ valid }}</td>
-<td>{{ premium }}</td>
-<td>{{ trafficleft }}</td>
-<td>{{ shared }}</td>
-<td>{{ activated }}</td>
-<td>
- <button type="button" class="btn btn-danger">Delete</button>
-</td> \ No newline at end of file
+<div class="span3">
+ <img src="{{ pluginIcon plugin }}"> {{ plugin }}
+</div>
+<div class="span3">
+ {{ loginname }}
+</div>
+<div class="span3">
+ {{ premium }}
+ {{ formatSize trafficleft }}
+ {{ shared }}
+ {{ activated }}
+</div>
+<div class="span3">
+ <button type="button" class="btn btn-danger">Delete</button>
+</div> \ No newline at end of file
diff --git a/pyload/web/app/templates/default/accounts/actionbar.html b/pyload/web/app/templates/default/accounts/actionbar.html
index f4652ec42..239254dc1 100644
--- a/pyload/web/app/templates/default/accounts/actionbar.html
+++ b/pyload/web/app/templates/default/accounts/actionbar.html
@@ -1,5 +1,5 @@
-<div class="span2 offset1">
-</div>
-<span class="span9">
- <button class="btn btn-small btn-blue btn-add">Add Account</button>
-</span> \ No newline at end of file
+<ul class="actionbar nav span8 offset3">
+ <li>
+ <button class="btn btn-small btn-blue btn-add">Add Account</button>
+ </li>
+</ul> \ No newline at end of file
diff --git a/pyload/web/app/templates/default/accounts/layout.html b/pyload/web/app/templates/default/accounts/layout.html
index e6627500d..bd8256659 100644
--- a/pyload/web/app/templates/default/accounts/layout.html
+++ b/pyload/web/app/templates/default/accounts/layout.html
@@ -1,19 +1,10 @@
-<!--{# TODO: responsive layout instead of table #}-->
-<div class="span10 offset2">
- <table class="table table-striped">
- <thead>
- <tr>
- <th>Plugin</th>
- <th>Name</th>
- <th>Valid</th>
- <th>Premium</th>
- <th>Traffic</th>
- <th>Shared</th>
- <th>Activated</th>
- <th>Delete</th>
- </tr>
- </thead>
- <tbody class="account-list">
- </tbody>
- </table>
+<div class="span3">
+ <h1 class="vertical-header">
+ {{ _ "Accounts" }}
+ </h1>
+</div>
+<div class="span9">
+ <div class="container-fluid account-list">
+
+ </div>
</div> \ No newline at end of file
diff --git a/pyload/web/app/templates/default/dashboard/actionbar.html b/pyload/web/app/templates/default/dashboard/actionbar.html
index ad9a1278d..341ece0bc 100644
--- a/pyload/web/app/templates/default/dashboard/actionbar.html
+++ b/pyload/web/app/templates/default/dashboard/actionbar.html
@@ -1,6 +1,10 @@
<div class="span2 offset1">
</div>
<ul class="actionbar nav nav-pills span9">
+ <li class="li-check">
+ <a href="#"><i class="icon-check-empty btn-check"></i></a>
+ </li>
+
<li>
<ul class="breadcrumb">
<li><a href="#">Local</a> <span class="divider">/</span></li>
@@ -16,9 +20,6 @@
</div>
</form>
</li>
- <li style="float: right" class="li-check">
- <a href="#"><i class="icon-check-empty btn-check"></i></a>
- </li>
<li class="dropdown" style="float: right;">
<a class="dropdown-toggle type"
data-toggle="dropdown"
diff --git a/pyload/web/app/templates/default/dashboard/select.html b/pyload/web/app/templates/default/dashboard/select.html
index f4c696d11..8f04d410e 100644
--- a/pyload/web/app/templates/default/dashboard/select.html
+++ b/pyload/web/app/templates/default/dashboard/select.html
@@ -2,7 +2,7 @@
{{#if packs }}{{ ngettext "1 package" "%d packages" packs }}{{/if}}
{{#if files}}
{{#if packs}}, {{/if}}
-{{ ngettext "1 file" "%d files" files }}
+{{ngettext "1 file" "%d files" files}}
{{/if }}
selected
&nbsp;|&nbsp;
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-23 20:43:01 +0100