diff --git a/src/webui/www/private/index.html b/src/webui/www/private/index.html index 31753b09f..0459315e5 100644 --- a/src/webui/www/private/index.html +++ b/src/webui/www/private/index.html @@ -48,14 +48,21 @@
  • QBT_TR(P&ause All)QBT_TRQBT_TR(P&ause All)QBT_TR
  • QBT_TR(&Resume)QBT_TRQBT_TR(&Resume)QBT_TR
  • QBT_TR(&Pause)QBT_TRQBT_TR(&Pause)QBT_TR
    • -
  • QBT_TR(Force recheck)QBT_TRQBT_TR(Force recheck)QBT_TR
  • QBT_TR(&Delete)QBT_TRQBT_TR(&Delete)QBT_TR
    • + +
  • QBT_TR(Top Priority)QBT_TRQBT_TR(Top Priority)QBT_TR
    • +
  • QBT_TR(Increase Priority)QBT_TRQBT_TR(Increase Priority)QBT_TR
    • +
  • QBT_TR(Decrease Priority)QBT_TRQBT_TR(Decrease Priority)QBT_TR
    • +
  • QBT_TR(Minimum Priority)QBT_TRQBT_TR(Minimum Priority)QBT_TR
    • +     +
  • QBT_TR(Force Recheck)QBT_TRQBT_TR(Force Recheck)QBT_TR
  • QBT_TR(&View)QBT_TR
  • @@ -67,9 +74,8 @@
  • QBT_TR(&Help)QBT_TR
    • @@ -77,8 +83,8 @@
       - QBT_TR(&Add Torrent File...)QBT_TR QBT_TR(Add Torrent &Link...)QBT_TR + QBT_TR(&Add Torrent File...)QBT_TR QBT_TR(Delete)QBT_TR QBT_TR(Resume)QBT_TR QBT_TR(Pause)QBT_TR diff --git a/src/webui/www/public/about.html b/src/webui/www/public/about.html index c5c39d5dd..ec816d3f2 100644 --- a/src/webui/www/public/about.html +++ b/src/webui/www/public/about.html @@ -1,7 +1,10 @@ -

    qBittorrent ${VERSION} QBT_TR(Web UI)QBT_TR

    +

    qBittorrent ${VERSION} QBT_TR(Web UI)QBT_TR

    +

    QBT_TR(An advanced BitTorrent client programmed in C++, based on Qt toolkit and libtorrent-rasterbar.)QBT_TR

    Copyright (c) 2011-2015 The qBittorrent project

    QBT_TR(Home Page: )QBT_TR http://www.qbittorrent.org

    - +

    QBT_TR(Bug Tracker: )QBT_TR http://bugs.qbittorrent.org

    +

    QBT_TR(Forum: )QBT_TR http://forum.qbittorrent.org

    +

    QBT_TR(IRC: #qbittorrent on Freenode)QBT_TR

    QBT_TR(Original authors)QBT_TR

    Ishan Arora, Ankit Gupta, Chandan Shikhar Dua and Swapnil Kumar. diff --git a/src/webui/www/public/css/Layout.css b/src/webui/www/public/css/Layout.css index f400335df..c9d8bf7a4 100644 --- a/src/webui/www/public/css/Layout.css +++ b/src/webui/www/public/css/Layout.css @@ -108,7 +108,6 @@ body { /* Fixes by Chris */ /*background-color: #ccc;*/ height: 20px; - margin-bottom: 5px; border-bottom: 1px solid #3f3f3f; } diff --git a/src/webui/www/public/css/style.css b/src/webui/www/public/css/style.css index d5ddf31dd..7d3f87f27 100644 --- a/src/webui/www/public/css/style.css +++ b/src/webui/www/public/css/style.css @@ -8,396 +8,408 @@ a img,:link img,:visited img { border: none; } /* Structure */ body { - margin: 0; - text-align: left; - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - line-height: 18px; - color: #555; + margin: 0; + text-align: left; + font-family: Arial, Helvetica, sans-serif; + font-size: 12px; + line-height: 18px; + color: #555; } .aside { - width: 300px; + width: 300px; } .invisible { - display: none; + display: none; } /* Typography */ - + h2, h3, h4 { - margin: 0; - padding: 0 0 5px 0; - font-size: 12px; - font-weight: bold; - color: #333; + margin: 0; + padding: 0 0 5px 0; + font-size: 12px; + font-weight: bold; + color: #333; } - + h2 { - font-size: 14px; - color: #555; - font-weight: bold; + font-size: 14px; + color: #555; + font-weight: bold; } - + #mochaPage h3 { - display: block; - font-size: 12px; - padding: 6px 0 6px 0; - margin: 0 0 8px 0; - border-bottom: 1px solid #bbb; + display: block; + font-size: 12px; + padding: 6px 0 6px 0; + margin: 0 0 8px 0; + border-bottom: 1px solid #bbb; } #error_div { - color: #f00; - font-weight: bold; + color: #f00; + font-weight: bold; } h4 { - font-size: 11px; + font-size: 11px; } - + a { - color: #e60; - text-decoration: none; - cursor: pointer; + color: #e60; + text-decoration: none; + cursor: pointer; } a:hover { - text-decoration: none; + text-decoration: none; } - + p { - margin: 0; - padding: 0 0 9px 0; + margin: 0; + padding: 0 0 9px 0; } - + /* List Elements */ ul { - list-style: outside; - margin: 0 0 9px 16px; + list-style: outside; + margin: 0 0 9px 16px; } dt { - font-weight: bold; - } - + font-weight: bold; +} + dd { - padding: 0 0 9px 0; -} + padding: 0 0 9px 0; +} /* Code */ - + pre { - background-color: #f6f6f6; - color: #006600; - display: block; - font-family: 'Courier New', Courier, monospace; - font-size: 11px; - max-height: 250px; - overflow: auto; - margin: 0 0 10px 0; - padding: 10px; - border: 1px solid #d1d7dc; - } - + background-color: #f6f6f6; + color: #006600; + display: block; + font-family: 'Courier New', Courier, monospace; + font-size: 11px; + max-height: 250px; + overflow: auto; + margin: 0 0 10px 0; + padding: 10px; + border: 1px solid #d1d7dc; + } + /* Dividers */ hr { - background-color: #ddd; - color: #ccc; - height: 1px; - border: 0px; + background-color: #ddd; + color: #ccc; + height: 1px; + border: 0px; } .vcenter { - vertical-align: middle; + vertical-align: middle; } #urls { - width:90%; - height:100%; + width:90%; + height:100%; } #trackersUrls { - width:90%; - height:100%; + width:90%; + height:100%; } #Filters ul { - list-style-type: none; + list-style-type: none; } #Filters ul li { - margin-left: -16px; + margin-left: -16px; } #Filters ul img { - padding: 2px 4px; - vertical-align: middle; - width: 16px; - height: 16px; + padding: 2px 4px; + vertical-align: middle; + width: 16px; + height: 16px; } .selectedFilter { - background-color: #354158; - color: #000; + background-color: #354158; + color: #000; } #properties { - background-color: #e5e5e5; + background-color: #e5e5e5; } a.propButton { - border: 1px solid rgb(85, 81, 91); - /*border-radius: 3px;*/ - padding: 2px; - margin-left: 3px; - margin-right: 3px; + border: 1px solid rgb(85, 81, 91); + /*border-radius: 3px;*/ + padding: 2px; + margin-left: 3px; + margin-right: 3px; } a.propButton img { - margin-bottom: -4px; + margin-bottom: -4px; } /* context menu specific */ -#contextmenu { border:1px solid #999; padding:0; background:#eee; list-style-type:none; display:none;} -#contextmenu .separator { border-top:1px solid #999; } -#contextmenu li { margin:0; padding:0;} + +#contextmenu { border:1px solid #999; padding:0; background:#eee; list-style-type:none; display:none;} +#contextmenu .separator { border-top:1px solid #999; } +#contextmenu li { margin:0; padding:0;} #contextmenu li a { display:block; padding:5px 10px 5px 5px; font-size:12px; text-decoration:none; font-family:tahoma,arial,sans-serif; color:#000; } -#contextmenu li a:hover { background-color:#ddd; } +#contextmenu li a:hover { background-color:#ddd; } #contextmenu li a.disabled { color:#ccc; font-style:italic; } #contextmenu li a.disabled:hover { background-color:#eee; } #contextmenu li ul { - padding: 0; - border:1px solid #999; padding:0; background:#eee; - list-style-type:none; - position: absolute; - left: -999em; - z-index: 8000; - margin: -29px 0 0 100%; - width: 164px; + padding: 0; + border:1px solid #999; padding:0; background:#eee; + list-style-type:none; + position: absolute; + left: -999em; + z-index: 8000; + margin: -29px 0 0 100%; + width: 164px; } #contextmenu li ul li a { - position: relative; + position: relative; } #contextmenu li a.arrow-right, #contextmenu li a:hover.arrow-right { - background-image: url(../images/skin/arrow-right.gif); - background-repeat: no-repeat; - background-position: right center; -} + background-image: url(../images/skin/arrow-right.gif); + background-repeat: no-repeat; + background-position: right center; +} #contextmenu li:hover ul, #contextmenu li.ieHover ul, #contextmenu li li.ieHover ul, #contextmenu li li li.ieHover ul, #contextmenu li li:hover ul, #contextmenu li li li:hover ul { /* lists nested under hovered list items */ - left: auto; + left: auto; } #contextmenu li img { - width: 16px; - height: 16px; - margin-bottom: -4px; - -ms-interpolation-mode : bicubic; + width: 16px; + height: 16px; + margin-bottom: -4px; + -ms-interpolation-mode : bicubic; } /* Sliders */ .slider { - clear: both; - position: relative; - font-size: 12px; - font-weight: bold; - width: 400px; - margin-bottom: 15px; + clear: both; + position: relative; + font-size: 12px; + font-weight: bold; + width: 400px; + margin-bottom: 15px; } .sliderWrapper { - position: relative; - font-size: 1px; - line-height: 1px; - height: 9px; - width: 422px; + position: relative; + font-size: 1px; + line-height: 1px; + height: 9px; + width: 422px; } .sliderarea { - position: absolute; - top: 0; - left: 0; - height: 7px; - width: 420px; - font-size: 1px; - line-height: 1px; - background: #f2f2f2 url(../images/skin/slider-area.gif) repeat-x; - border: 1px solid #a3a3a3; - border-bottom: 1px solid #ccc; - border-left: 1px solid #ccc; - margin: 0; - padding: 0; - overflow: hidden; + position: absolute; + top: 0; + left: 0; + height: 7px; + width: 420px; + font-size: 1px; + line-height: 1px; + background: #f2f2f2 url(../images/skin/slider-area.gif) repeat-x; + border: 1px solid #a3a3a3; + border-bottom: 1px solid #ccc; + border-left: 1px solid #ccc; + margin: 0; + padding: 0; + overflow: hidden; } - + .sliderknob { - position: absolute; - top: 0; - left: 0; - height: 9px; - width: 19px; - font-size: 1px; - line-height: 1px; - background: url(../images/skin/knob.gif) no-repeat; - cursor: pointer; - overflow: hidden; - z-index: 2; + position: absolute; + top: 0; + left: 0; + height: 9px; + width: 19px; + font-size: 1px; + line-height: 1px; + background: url(../images/skin/knob.gif) no-repeat; + cursor: pointer; + overflow: hidden; + z-index: 2; } - + .update { - padding-bottom: 5px; + padding-bottom: 5px; } .mochaToolButton { - margin-right: 10px; + margin-right: 10px; } /* Mocha Customization */ +#mochaToolbar { + margin-top: 5px; +} + #mochaToolbar .divider { - background-image: url(../images/skin/toolbox-divider.gif); - background-repeat: no-repeat; - background-position: left center; - padding-left: 14px; - padding-top: 15px; + background-image: url(../images/skin/toolbox-divider.gif); + background-repeat: no-repeat; + background-position: left center; + padding-left: 14px; + padding-top: 15px; } .MyMenuIcon { - margin-left: -18px; - margin-bottom: -3px; - padding-right: 5px; + margin-left: -18px; + margin-bottom: -3px; + padding-right: 5px; } /* Tri-state checkbox */ + label.tristate { - background: url(../images/3-state-checkbox.gif) 0 0 no-repeat; - display: block; - float: left; - height: 13px; - margin: .15em 8px 5px 0px; - overflow: hidden; - text-indent: -999em; - width: 13px; + background: url(../images/3-state-checkbox.gif) 0 0 no-repeat; + display: block; + float: left; + height: 13px; + margin: .15em 8px 5px 0px; + overflow: hidden; + text-indent: -999em; + width: 13px; +} + +label.checked { + background-position: 0 -13px; +} + +label.partial { + background-position: 0 -26px; } -label.checked { background-position: 0 -13px; } -label.partial { background-position: 0 -26px; } fieldset.settings { - border: solid 1px black; - border-radius: 8px; - -webkit-border-radius: 8px; - -moz-border-radius: 8px; - padding: 4px 4px 4px 10px; + border: solid 1px black; + border-radius: 8px; + -webkit-border-radius: 8px; + -moz-border-radius: 8px; + padding: 4px 4px 4px 10px; } fieldset.settings legend { - margin-left: 8px; - padding: 4px; - font-weight: bold; + margin-left: 8px; + padding: 4px; + font-weight: bold; } fieldset.settings label { - padding: 2px; + padding: 2px; } fieldset.settings .leftLabelSmall { - width: 5em; - float: left; - text-align: right; - margin-right: 0.5em; - display: block; + width: 5em; + float: left; + text-align: right; + margin-right: 0.5em; + display: block; } fieldset.settings .leftLabelLarge { - width: 14em; - float: left; - text-align: right; - margin-right: 0.5em; - display: block; + width: 14em; + float: left; + text-align: right; + margin-right: 0.5em; + display: block; } div.formRow { - clear: left; - display: block; + clear: left; + display: block; } ul.filterList { - margin: 0 0 0 16px; - padding-left: 0; + margin: 0 0 0 16px; + padding-left: 0; } ul.filterList a { - display: block; + display: block; } ul.filterList li:hover { - background-color: #e60; + background-color: #e60; } ul.filterList li:hover a { - color: white; + color: white; } #filesTable { - line-height: 20px; + line-height: 20px; } #trackersTable { - line-height: 25px; + line-height: 25px; } #addTrackersPlus { - width: 16px; - cursor: pointer; - margin-bottom: -3px; + width: 16px; + cursor: pointer; + margin-bottom: -3px; } .torrentTable th { - padding: 5px 10px; + padding: 5px 10px; } .torrentTable td { - padding: 0px 3px; + padding: 0px 3px; } .torrentTable thead tr { - background-color: #eee; + background-color: #eee; } #prop_general { - padding: 2px; + padding: 2px; } #watched_folders_tab { - border-collapse: collapse; + border-collapse: collapse; } #watched_folders_tab td, #watched_folders_tab th { - padding: 2px 4px; - border: 1px solid black; + padding: 2px 4px; + border: 1px solid black; } /* * Workaround to prevent the transfer list from - * disappearing when zooming in the browser. + * disappearing when zooming in the browser. */ #filtersColumn_handle { - margin-left: -1px; + margin-left: -1px; } #error_div { - float: left; - font-size: 14px; + float: left; + font-size: 14px; } .combo_priority { - font-size: 1em; + font-size: 1em; } diff --git a/src/webui/www/public/preferences.html b/src/webui/www/public/preferences.html index 882e59bc2..50bed9489 100644 --- a/src/webui/www/public/preferences.html +++ b/src/webui/www/public/preferences.html @@ -13,11 +13,10 @@
    @@ -27,25 +26,21 @@ // Tabs MochaUI.initializeTabs('preferencesTabs'); -$('PrefConnectionLink').addEvent('click', function(e){ - $$('.PrefTab').addClass('invisible'); - $('ConnectionTab').removeClass('invisible'); -}); -$('PrefBittorrentLink').addEvent('click', function(e) { - $$('.PrefTab').addClass('invisible'); - $('BittorrentTab').removeClass('invisible'); -}); $('PrefDownloadsLink').addEvent('click', function(e) { $$('.PrefTab').addClass('invisible'); $('DownloadsTab').removeClass('invisible'); }); -$('PrefProxyLink').addEvent('click', function(e) { +$('PrefConnectionLink').addEvent('click', function(e){ $$('.PrefTab').addClass('invisible'); - $('ProxyTab').removeClass('invisible'); + $('ConnectionTab').removeClass('invisible'); }); -$('PrefFilterLink').addEvent('click', function(e) { +$('PrefSpeedLink').addEvent('click', function(e) { $$('.PrefTab').addClass('invisible'); - $('FilterTab').removeClass('invisible'); + $('SpeedTab').removeClass('invisible'); +}); +$('PrefBittorrentLink').addEvent('click', function(e) { + $$('.PrefTab').addClass('invisible'); + $('BittorrentTab').removeClass('invisible'); }); $('PrefWebUILink').addEvent('click', function(e) { $$('.PrefTab').addClass('invisible'); diff --git a/src/webui/www/public/preferences_content.html b/src/webui/www/public/preferences_content.html index ca76f6cd4..b5d15372e 100644 --- a/src/webui/www/public/preferences_content.html +++ b/src/webui/www/public/preferences_content.html @@ -1,4 +1,71 @@ -
    +
    +
    + QBT_TR(Hard Disk)QBT_TR +
    + + +
    +
    + + + +
    +
    + QBT_TR(Automatically add torrents from:)QBT_TR
    + + + + +
    QBT_TR(Watched Folder)QBT_TRQBT_TR(Download here)QBT_TR
    Add

    + + +    +
    + + +
    +     + + +
    +
    + +
    + QBT_TR(Email notification upon download completion)QBT_TR + +
    +
    + +
    +
    + +
    +
    + +
    +
    +
    + +
    +
    + +
    +
    + +
    + QBT_TR(Run an external program on torrent completion)QBT_TR + +
    +
    +QBT_TR(The following parameters are supported:)QBT_TR +
      +
    • %f: QBT_TR(Torrent path)QBT_TR
      • +
    • %n: QBT_TR(Torrent name)QBT_TR
      • +
     +
    +
    + + + + - - - -