render templates as u...
Content-type: text/plain
Author: damoxc
Revision: 5030
Log:
remove all unused html files
render templates as unicode by default
Diff:
Modified: trunk/deluge/ui/web/common.py
===================================================================
--- trunk/deluge/ui/web/common.py 2009-04-06 23:20:32 UTC (rev 5029)
+++ trunk/deluge/ui/web/common.py 2009-04-07 15:18:02 UTC (rev 5030)
@@ -37,4 +37,5 @@
def render(self, *args, **data):
data.update(self.builtins)
- return MakoTemplate.render(self, *args, **data)
\ No newline at end of file
+ rendered = MakoTemplate.render_unicode(self, *args, **data)
+ return rendered.encode('utf-8', 'replace')
Modified: trunk/deluge/ui/web/gettext.js
===================================================================
--- trunk/deluge/ui/web/gettext.js 2009-04-06 23:20:32 UTC (rev 5029)
+++ trunk/deluge/ui/web/gettext.js 2009-04-07 15:18:02 UTC (rev 5030)
@@ -1,4 +1,3 @@
-## -*- coding: utf-8 -*-
/*
* Script: gettext.js
* A script file that is run through the template renderer in order for
Deleted: trunk/deluge/ui/web/render/add_torrent_files.html
===================================================================
--- trunk/deluge/ui/web/render/add_torrent_files.html 2009-04-06 23:20:32 UTC
(rev 5029)
+++ trunk/deluge/ui/web/render/add_torrent_files.html 2009-04-07 15:18:02 UTC
(rev 5030)
@@ -1 +0,0 @@
-<div class="filesTable"><table></table></div>
Deleted: trunk/deluge/ui/web/render/add_torrent_options.html
===================================================================
--- trunk/deluge/ui/web/render/add_torrent_options.html 2009-04-06 23:20:32 UTC
(rev 5029)
+++ trunk/deluge/ui/web/render/add_torrent_options.html 2009-04-07 15:18:02 UTC
(rev 5030)
@@ -1,42 +0,0 @@
-<form>
- <fieldset>
- <legend>${_("Allocation")}</legend>
- <label class="fluid">
- <input type="radio" name="compact_allocation" value="false" />
- ${_("Full")}
- </label><br />
- <label class="fluid">
- <input type="radio" name="compact_allocation" value="true" />
- ${_("Compact")}
- </label>
- </fieldset>
- <fieldset>
- <legend>${_("Bandwidth")}</legend>
-
- <label>${_("Max Down Speed")}:</label>
- <input type="text" name="max_download_speed_per_torrent"
class="moouiSpinner" /><br/>
-
- <label>${_("Max Up Speed")}:</label>
- <input type="text" name="max_upload_speed_per_torrent"
class="moouiSpinner" /><br/>
-
- <label>${_("Max Connections")}:</label>
- <input type="text" name="max_connections_per_torrent"
class="moouiSpinner" /><br/>
-
- <label>${_("Max Upload Slots")}:</label>
- <input type="text" name="max_upload_slots_per_torrent"
class="moouiSpinner" />
- </fieldset>
- <fieldset>
- <legend>${_("General")}</legend>
- <label class="fluid">
- <input type="checkbox" name="add_paused" />
- ${_("Add in Paused State")}
- </label><br/>
- <label class="fluid">
- <input type="checkbox" name="prioritize_first_last_pieces" />
- ${_("Prioritize First/Last Pieces")}
- </label>
- </fieldset>
- <br style="clear: both;" />
- <button>${_("Revert To Defaults")}</button>
- <button>${_("Apply To All")}</button>
-</form>
Deleted: trunk/deluge/ui/web/render/create_torrent_info.html
===================================================================
--- trunk/deluge/ui/web/render/create_torrent_info.html 2009-04-06 23:20:32 UTC
(rev 5029)
+++ trunk/deluge/ui/web/render/create_torrent_info.html 2009-04-07 15:18:02 UTC
(rev 5030)
@@ -1,2 +0,0 @@
-<label>Author:</label><input type="text" /><br/>
-<label>Comments:</label><input type="text" />
Deleted: trunk/deluge/ui/web/render/create_torrent_options.html
===================================================================
--- trunk/deluge/ui/web/render/create_torrent_options.html 2009-04-06
23:20:32 UTC (rev 5029)
+++ trunk/deluge/ui/web/render/create_torrent_options.html 2009-04-07
15:18:02 UTC (rev 5030)
@@ -1,21 +0,0 @@
-<fieldset>
- <label>Piece Size:</label>
- <select>
- <option>32 KiB</option>
- <option>64 KiB</option>
- <option>128 KiB</option>
- <option>256 KiB</option>
- <option>512 KiB</option>
- </select>
- <br/>
-
- <label class="fluid">
- <input type="checkbox" />
- ${_("Set Private Flag")}
- </label><br/>
-
- <label class="fluid">
- <input type="checkbox" />
- ${_("Add this torrent to the session")}
- </label>
-</fieldset>
Deleted: trunk/deluge/ui/web/render/create_torrent_trackers.html
===================================================================
--- trunk/deluge/ui/web/render/create_torrent_trackers.html 2009-04-06
23:20:32 UTC (rev 5029)
+++ trunk/deluge/ui/web/render/create_torrent_trackers.html 2009-04-07
15:18:02 UTC (rev 5030)
@@ -1,17 +0,0 @@
-<div id="createTorrentTrackersTable">
- <table>
- <thead>
- <tr>
- <th class="tier">Tier</th>
- <th class="tracker">Tracker</th>
- </tr>
- </thead>
- <tbody />
- </table>
-</div>
-<div id="createTorrentTrackersButtons">
- <button class="delugeButton">${_("Up")}</button>
- <button class="delugeButton">${_("Add")}</button>
- <button class="delugeButton">${_("Remove")}</button>
- <button class="delugeButton">${_("Down")}</button>
-</div>
Deleted: trunk/deluge/ui/web/render/create_torrent_webseeds.html
===================================================================
--- trunk/deluge/ui/web/render/create_torrent_webseeds.html 2009-04-06
23:20:32 UTC (rev 5029)
+++ trunk/deluge/ui/web/render/create_torrent_webseeds.html 2009-04-07
15:18:02 UTC (rev 5030)
@@ -1,3 +0,0 @@
-<fieldset>
- <textarea></textarea>
-</fieldset>
Deleted: trunk/deluge/ui/web/render/preferences_bandwidth.html
===================================================================
--- trunk/deluge/ui/web/render/preferences_bandwidth.html 2009-04-06
23:20:32 UTC (rev 5029)
+++ trunk/deluge/ui/web/render/preferences_bandwidth.html 2009-04-07
15:18:02 UTC (rev 5030)
@@ -1,51 +0,0 @@
-<form id="bandwidth_preferences">
- <fieldset>
- <legend>${_("Global Bandwidth Usage")}</legend>
- <label>${_("Max Connections")}:</label>
- <input type="text" name="max_connections_global" rel="spinner"
/>
- <br/>
-
- <label>${_("Max Upload Slots")}:</label>
- <input type="text" name="max_upload_slots_global" rel="spinner"
/>
- <br/>
-
- <label>${_("Max Download Speed")} (KiB/s):</label>
- <input type="text" name="max_download_speed" rel="spinner1" />
- <br/>
-
- <label>${_("Max Upload Speed")} (KiB/s):</label>
- <input type="text" name="max_upload_speed" rel="spinner1" />
- <br/>
-
- <label>${_("Max Half-Open Connections")}:</label>
- <input type="text" name="max_half_open_connections"
rel="spinner" />
- <br/>
-
- <label>${_("Max Conection Attempts per Second")}:</label>
- <input type="text" name="max_connections_per_second"
rel="spinner" />
- <br/>
-
- <label class="fluid">
- <input type="checkbox"
name="ignore_limits_on_local_network"/>
- ${_("Ignore limits on local network")}
- </label><br/>
- </fieldset>
- <fieldset>
- <legend>${_("Per Torrent Bandwidth Usage")}</legend>
- <label>${_("Max Connections")}:</label>
- <input type="text" name="max_connections_per_torrent"
rel="spinner" />
- <br/>
-
- <label>${_("Max Upload Slots")}:</label>
- <input type="text" name="max_upload_slots_per_torrent"
rel="spinner" />
- <br/>
-
- <label>${_("Max Download Speed")} (KiB/s):</label>
- <input type="text" name="max_download_speed_per_torrent"
rel="spinner1" />
- <br/>
-
- <label>${_("Max Upload Speed")} (KiB/s):</label>
- <input type="text" name="max_upload_speed_per_torrent"
rel="spinner1" />
- <br/>
- </fieldset>
-</form>
Deleted: trunk/deluge/ui/web/render/preferences_daemon.html
===================================================================
--- trunk/deluge/ui/web/render/preferences_daemon.html 2009-04-06 23:20:32 UTC
(rev 5029)
+++ trunk/deluge/ui/web/render/preferences_daemon.html 2009-04-07 15:18:02 UTC
(rev 5030)
@@ -1,14 +0,0 @@
-<form>
- <fieldset>
- <legend>${_("Port")}</legend>
- <label>${_("Daemon Port")}:</label><input type="text"
name="daemon_port" rel="spinner" /><br/>
- </fieldset>
- <fieldset>
- <legend>${_("Connections")}</legend>
- <label class="fluid"><input type="checkbox" name="allow_remote"
/>${_("Allow Remote Connections")}</label>
- </fieldset>
- <fieldset>
- <legend>${_("Other")}</legend>
- <label class="fluid"><input type="checkbox"
name="new_release_check" />${_("Periodically check the website for new
releases")}</label>
- </fieldset>
-</form>
Deleted: trunk/deluge/ui/web/render/preferences_download.html
===================================================================
--- trunk/deluge/ui/web/render/preferences_download.html 2009-04-06
23:20:32 UTC (rev 5029)
+++ trunk/deluge/ui/web/render/preferences_download.html 2009-04-07
15:18:02 UTC (rev 5030)
@@ -1,45 +0,0 @@
-<form>
- <fieldset>
- <legend>${_("Folders")}</legend>
- <label>
- ${_("Download to")}:
- </label>
- <input type="text" name="download_location" /><br/>
-
- <label>
- <input type="checkbox" name="move_completed" />
- ${_("Move completed to")}:
- </label>
- <input type="text" name="move_completed_path" /><br />
-
- <label>
- <input type="checkbox" name="copy_torrent_file" />
- ${_("Copy of .torrent files to")}:
- </label>
- <input type="text" name="torrentfiles_location" /><br/>
-
- <label>
- <input type="checkbox" name="autoadd_enable" />
- ${_("Auto add .torrents from")}:
- </label>
- <input type="text" name="autoadd_location" /><br/>
- </fieldset>
- <fieldset>
- <legend>${_("Allocation")}</legend>
- <label>
- <input type="radio" name="compact_allocation"
value="false" />
- ${_("Use Full Allocation")}
- </label>
- <label>
- <input type="radio" name="compact_allocation"
value="true" />
- ${_("Use Compact Allocation")}
- </label>
- </fieldset>
- <fieldset>
- <legend>${_("Options")}</legend>
- <label class="fluid">
- <input type="checkbox"
name="prioritize_first_last_pieces" />
- ${_("Prioritize first and last pieces of torrent")}
- </label>
- </fieldset>
-</form>
Deleted: trunk/deluge/ui/web/render/preferences_network.html
===================================================================
--- trunk/deluge/ui/web/render/preferences_network.html 2009-04-06 23:20:32 UTC
(rev 5029)
+++ trunk/deluge/ui/web/render/preferences_network.html 2009-04-07 15:18:02 UTC
(rev 5030)
@@ -1,94 +0,0 @@
-<form>
- <fieldset>
- <legend>${_("Incoming Ports")}</legend>
- <label>
- <input type="checkbox" name="random_port" />
- ${_("Use Random Ports")}
- </label><br/>
-
- <label class="fluid">
- ${_("From")}:
- </label>
- <input type="text" name="start_listen_port" rel="spinner" />
- <label class="fluid">
- ${_("To")}:
- </label>
- <input type="text" name="end_listen_port" rel="spinner" /><br/>
- </fieldset>
-
- <fieldset>
- <legend>${_("Outgoing Ports")}</legend>
- <label>
- <input type="checkbox" name="random_outgoing_ports" />
- ${_("Use Random Ports")}
- </label><br/>
-
- <label class="fluid">
- ${_("From")}:
- </label>
- <input type="text" name="start_outgoing_port" rel="spinner" />
- <label class="fluid">
- ${_("To")}:
- </label>
- <input type="text" name="end_outgoing_port" rel="spinner"
/><br/>
- </fieldset>
-
- <fieldset>
- <legend>${_("TOS")}</legend>
- <label>${_("Peer TOS Byte")}:</label>
- <input type="text" name="peer_tos" />
- </fieldset>
-
- <fieldset>
- <legend>${_("Network Extras")}</legend>
- <label>
- <input type="checkbox" name="upnp" />
- ${_("UPnP")}
- </label>
- <label>
- <input type="checkbox" name="natpmp" />
- ${_("NAT-PMP")}
- </label>
- <label>
- <input type="checkbox" name="dht" />
- ${_("Enable Mainline DHT")}
- </label>
- <label>
- <input type="checkbox" name="utpex" />
- ${_("Peer Exchange")}
- </label>
- <label>
- <input type="checkbox" name="lsd" />
- ${_("LSD")}
- </label>
- </fieldset>
- <fieldset id="encryption">
- <legend>${_("Encryption")}</legend>
-
- <label>${_("Inbound")}:</label>
- <select name="enc_in_policy">
- <option value="0">${_("Forced")}</option>
- <option value="1">${_("Enabled")}</option>
- <option value="2">${_("Disabled")}</option>
- </select>
-
- <label>${_("Outbound")}:</label>
- <select name="enc_out_policy">
- <option value="0">${_("Forced")}</option>
- <option value="1">${_("Enabled")}</option>
- <option value="2">${_("Disabled")}</option>
- </select><br/>
-
- <label>${_("Level")}:</label>
- <select name="enc_level">
- <option value="0">${_("Handshake")}</option>
- <option value="1">${_("Full Stream")}</option>
- <option value="2">${_("Either")}</option>
- </select>
-
- <label class="fluid">
- <input type="checkbox" name="enc_prefer_rc4" />
- ${_("Encrypt entire stream")}
- </label>
- </fieldset>
-</form>
Deleted: trunk/deluge/ui/web/render/preferences_queue.html
===================================================================
--- trunk/deluge/ui/web/render/preferences_queue.html 2009-04-06 23:20:32 UTC
(rev 5029)
+++ trunk/deluge/ui/web/render/preferences_queue.html 2009-04-07 15:18:02 UTC
(rev 5030)
@@ -1,21 +0,0 @@
-<form>
- <fieldset>
- <legend>${_("General")}</legend>
- <label class="fluid"><input type="checkbox"
name="queue_new_to_top" />${_("Queue new torrents to top")}</label>
- </fieldset>
- <fieldset>
- <legend>${_("Active Torrents")}</legend>
- <label>${_("Total active")}:</label><input type="text"
name="max_active_limit" rel="spinner" /><br/>
- <label>${_("Total active downloading")}:</label><input
type="text" name="max_active_downloading" rel="spinner" /><br/>
- <label>${_("Total active seeding")}:</label><input type="text"
name="max_active_seeding" rel="spinner" /><br/>
- <label class="fluid"><input type="checkbox"
name="dont_count_slow_torrents" />${_("Do not count slow torrents")}</label>
- </fieldset>
- <fieldset>
- <legend>${_("Seeding")}</legend>
- <label>${_("Share Ratio Limit")}:</label><input type="text"
name="share_ratio_limit" rel="spinner2" /><br/>
- <label>${_("Seed Time Ratio")}:</label><input type="text"
name="stop_seed_ratio" rel="spinner2" /><br/>
- <label>${_("Seed Time")} (m):</label><input type="text"
name="seed_time_limit" rel="spinner" /><br/>
- <label class="fluid"><input type="checkbox"
name="stop_seed_at_ratio" />${_("Stop seeding when share ratio
reaches")}:</label><input type="text" name="stop_seed_ratio" rel="spinner2" />
- <label class="fluid"><input type="checkbox"
name="remote_seed_at_ratio" />${_("Remove torrent when share ratio
reached")}</label>
- </fieldset>
-</form>
Deleted: trunk/deluge/ui/web/render/preferences_webui.html
===================================================================
--- trunk/deluge/ui/web/render/preferences_webui.html 2009-04-06 23:20:32 UTC
(rev 5029)
+++ trunk/deluge/ui/web/render/preferences_webui.html 2009-04-07 15:18:02 UTC
(rev 5030)
@@ -1,31 +0,0 @@
-<form>
- <fieldset>
- <legend>${_("Template")}</legend>
- <label>${_("Template")}</label>
- <select name="template">
-
- </select><br/>
- <label id="lbl_theme">${_("Theme")}</label>
- <select name="theme">
- <option value="classic">Classic</option>
- <option value="white">White</option>
- </select><br/>
- <label>${_("Button Style")}</label>
- <select name="button_style">
- <option value="0">${_("Text and Image")}</option>
- <option value="1">${_("Image Only")}</option>
- <option value="2">${_("Text Only")}</option>
- </select><br/>
- <label><input type="checkbox" name="cache_templates" />
${_("Cache Templates")}</label><br/>
- </fieldset>
- <fieldset>
- <legend>${_("Server")}</legend>
- <label>${_("Port")}</label><input type="text" name="port"
rel="spinner" /><br/>
- </fieldset>
- <fieldset>
- <legend>${_("Password")}</legend>
- <label>${_("Current Password")}</label><input type="password"
/><br/>
- <label>${_("New Password")}</label><input type="password"
/><br/>
- <label>${_("New Password (Confirm)")}</label><input
type="password" /><br/>
- </fieldset>
-</form>
Deleted: trunk/deluge/ui/web/render/tab_files.html
===================================================================
--- trunk/deluge/ui/web/render/tab_files.html 2009-04-06 23:20:32 UTC (rev
5029)
+++ trunk/deluge/ui/web/render/tab_files.html 2009-04-07 15:18:02 UTC (rev
5030)
@@ -1,13 +0,0 @@
-<div id="files">
- <table>
- <thead>
- <tr class="header">
- <th class="filename">${_("Filename")}</th>
- <th class="size">${_("Size")}</th>
- <th class="progress">${_("Progress")}</th>
- <th class="priority">${_("Priority")}</th>
- </tr>
- </thead>
- <tbody/>
- </table>
-</div>
Deleted: trunk/deluge/ui/web/render/tab_options.html
===================================================================
--- trunk/deluge/ui/web/render/tab_options.html 2009-04-06 23:20:32 UTC (rev
5029)
+++ trunk/deluge/ui/web/render/tab_options.html 2009-04-07 15:18:02 UTC (rev
5030)
@@ -1,26 +0,0 @@
-<form>
- <fieldset>
- <legend>${_("Bandwidth")}</legend>
- <label>${_("Max Download Speed")}</label><input type="text"
name="max_download_speed" size="3" /> KiB/s<br />
- <label>${_("Max Upload Speed")}</label><input type="text"
name="max_upload_speed" size="3" /> KiB/s<br />
- <label>${_("Max Connections")}</label><input type="text"
name="max_connections" size="3" /><br />
- <label>${_("Max Upload Slots")}</label><input type="text"
name="max_upload_slots" size="3" /><br />
- </fieldset>
-
- <fieldset>
- <legend>${_("Queue")}</legend>
- <label><input type="checkbox" name="is_auto_managed"
/>${_("Auto Managed")}</label><br />
- <label><input type="checkbox" name="stop_at_ratio" />${_("Stop
seed at ratio")}</label><input type="text" name="stop_ratio" size="3"
value="2.00" /><br />
- <label><input type="checkbox" name="remove_at_ratio"
/>${_("Remove at ratio")}</label><br />
- </fieldset>
-
- <fieldset>
- <legend>${_("General")}</legend>
- <label><input type="checkbox" name="private"
/>${_("Private")}</label><br />
- <label><input type="checkbox" name="prioritize_first_last"
/>${_("Prioritize First/Last")}</label><br />
- <input type="button" name="edit_trackers" value="${_("Edit
Trackers")}" class="deluge_button" /><br />
- <input type="button" name="reset_options" value="${_("Reset")}"
class="deluge_button" />
- <input type="button" name="apply_options" value="${_("Apply")}"
class="deluge_button" /><br/>
- </fieldset>
-</form>
-<br style="clear: both;" />
Deleted: trunk/deluge/ui/web/render/tab_peers.html
===================================================================
--- trunk/deluge/ui/web/render/tab_peers.html 2009-04-06 23:20:32 UTC (rev
5029)
+++ trunk/deluge/ui/web/render/tab_peers.html 2009-04-07 15:18:02 UTC (rev
5030)
@@ -1,14 +0,0 @@
-<div id="peers" class="gridview">
- <table>
- <thead>
- <tr class="header">
- <th class="country"></th>
- <th class="name">${_("Address")}</th>
- <th class="client">${_("Client")}</th>
- <th class="downspeed">${_("Down Speed")}</th>
- <th class="upspeed">${_("Up Speed")}</th>
- </tr>
- </thead>
- <tbody/>
- </table>
-</div>
Deleted: trunk/deluge/ui/web/render/window_add_torrent.html
===================================================================
--- trunk/deluge/ui/web/render/window_add_torrent.html 2009-04-06 23:20:32 UTC
(rev 5029)
+++ trunk/deluge/ui/web/render/window_add_torrent.html 2009-04-07 15:18:02 UTC
(rev 5030)
@@ -1,13 +0,0 @@
-<h3>${_("Torrents")}</h3>
-<select size="8"></select>
-<div id="addButtons">
- <button class="file">${_("File")}</button>
- <button class="url">${_("Url")}</button>
- <button class="infohash">${_("Infohash")}</button>
- <button class="remove">${_("Remove")}</button>
-</div>
-<div id="tabs" class="moouiTabs"></div>
-<div id="buttons">
- <button class="cancel">${_("Cancel")}</button>
- <button class="add">${_("Add")}</button>
-</div>
Deleted: trunk/deluge/ui/web/render/window_add_torrent_file.html
===================================================================
--- trunk/deluge/ui/web/render/window_add_torrent_file.html 2009-04-06
23:20:32 UTC (rev 5029)
+++ trunk/deluge/ui/web/render/window_add_torrent_file.html 2009-04-07
15:18:02 UTC (rev 5030)
@@ -1,18 +0,0 @@
-<html>
- <head>
- <link rel="stylesheet" type="text/css"
href="$base/template/static/themes/classic/iframe.css" />
- </head>
- <body style="background: none;">
- <form method="post" action="/json/upload"
enctype="multipart/form-data">
- <label>${_("File")}:</label>
- <div class="fileInputs">
- <input type="file" name="torrentFile" class="file" size="35"/>
- <div class="fakeFile">
- <input />
- <button>${_("Browse")}</button>
- </div>
- </div><br/>
- <button class="ok">${_("Ok")}</button><button
class="cancel">${_("Cancel")}</button>
- </form>
- </body>
-</html>
Deleted: trunk/deluge/ui/web/render/window_create_torrent.html
===================================================================
--- trunk/deluge/ui/web/render/window_create_torrent.html 2009-04-06
23:20:32 UTC (rev 5029)
+++ trunk/deluge/ui/web/render/window_create_torrent.html 2009-04-07
15:18:02 UTC (rev 5030)
@@ -1,14 +0,0 @@
-<h3>Files</h3>
-<table id="createTorrentFiles">
-</table>
-<div id="browse">
- <button class="file">File</button>
- <button class="folder">Folder</button>
-</div>
-<form>
- <div id="tabs" class="moouiTabs"></div>
-</form>
-<div id="buttons">
- <button id="cancel">Cancel</button>
- <button id="save">Save</button>
-</div>
Deleted: trunk/deluge/ui/web/render/window_preferences.html
===================================================================
--- trunk/deluge/ui/web/render/window_preferences.html 2009-04-06 23:20:32 UTC
(rev 5029)
+++ trunk/deluge/ui/web/render/window_preferences.html 2009-04-07 15:18:02 UTC
(rev 5030)
@@ -1,13 +0,0 @@
-<div id="preferences">
- <div class="categories">
- <h3>${_("Categories")}</h3>
- <ul>
- </ul>
- </div>
- <div class="pref_pages">
- <h3></h3>
- </div>
- <div class="buttons">
- <button class="reset
deluge_button">${_("Reset")}</button><button class="apply
deluge_button">${_("Apply")}</button>
- </div>
-</div>
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"deluge-commit" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/deluge-commit?hl=en
-~----------~----~----~----~------~----~------~--~---
