Set version to 2.0.0

Causing failed starts

ABOUT.txt

@@ -1,5 +1,5 @@
 *******************************************
-*** This is SABnzbd 2.2.0               ***
+*** This is SABnzbd 2.0.0               ***
 *******************************************
 SABnzbd is an open-source cross-platform binary newsreader.
 It simplifies the process of downloading from Usenet dramatically,

INSTALL.txt

@@ -1,4 +1,4 @@
-                                SABnzbd 2.2.0
+                                SABnzbd 2.0.0
 
 -------------------------------------------------------------------------------
 0) LICENSE
@@ -64,15 +64,15 @@ Windows
 
 Essential modules
     cheetah-2.0.1+          use "pip install cheetah"
-    par2cmdline >= 0.4      https://github.com/Parchive/par2cmdline/releases
-                            See also: https://sabnzbd.org/wiki/installation/multicore-par2
+    par2cmdline >= 0.4      http://parchive.sourceforge.net/
+                            Note: https://sabnzbd.org/wiki/configuration/2.0/switches#par2cmdline
+                            And: https://sabnzbd.org/wiki/installation/multicore-par2
     unrar >= 5.00+          http://www.rarlab.com/rar_add.htm
 
 Optional modules
     unzip >= 6.00           http://www.info-zip.org/
     7zip >= 9.20            http://www.7zip.org/
-    sabyenc == 3.0.2        use "pip install sabyenc"
-                            More information: https://sabnzbd.org/sabyenc
+    sabyenc == 3.0.2        use "pip install sabyenc" - https://sabnzbd.org/sabyenc
     openssl >= 1.0.0        http://www.openssl.org/
                             v0.9.8 will work, but limits certificate validation
     cryptography >= 1.0     use "pip install cryptography"

ISSUES.txt

@@ -24,13 +24,13 @@
   For these the server blocking method is not very favourable.
   There is an INI-only option that will limit blocks to 1 minute.
       no_penalties = 1
-  See: https://sabnzbd.org/wiki/configuration/2.2/special
+  See: https://sabnzbd.org/wiki/configuration/2.0/special
 
 - Some third-party utilties try to probe SABnzbd API in such a way that you will
   often see warnings about unauthenticated access.
   If you are sure these probes are harmless, you can suppress the warnings by
   setting the option "api_warnings" to 0.
-  See: https://sabnzbd.org/wiki/configuration/2.2/special
+  See: https://sabnzbd.org/wiki/configuration/2.0/special
 
 - On OSX you may encounter downloaded files with foreign characters.
   The par2 repair may fail when the files were created on a Windows system.
@@ -41,7 +41,7 @@
   You will see this only when downloaded files contain accented characters.
   You need to fix it yourself by running the convmv utility (available for most Linux platforms).
   Possible the file system override setting 'fsys_type' might be solve things:
-  See: https://sabnzbd.org/wiki/configuration/2.2/special
+  See: https://sabnzbd.org/wiki/configuration/2.0/special
 
 - The "Watched Folder" sometimes fails to delete the NZB files it has
   processed. This happens when other software still accesses these files.
@@ -81,4 +81,4 @@
   - Squeeze Linux
   There is a "special" option that will allow you to select an alternative library.
       use_pickle = 1
-  See: https://sabnzbd.org/wiki/configuration/2.2/special
+  See: https://sabnzbd.org/wiki/configuration/2.0/special

PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 1.0
 Name: SABnzbd
-Version: 2.2.0RC2
-Summary: SABnzbd-2.2.0RC2
-Home-page: https://sabnzbd.org
+Version: 2.0.0
+Summary: SABnzbd-2.0.0
+Home-page: http://sabnzbd.org
 Author: The SABnzbd Team
 Author-email: team@sabnzbd.org
 License: GNU General Public License 2 (GPL2 or later)

README.md

@@ -5,7 +5,7 @@ SABnzbd is an Open Source Binary Newsreader written in Python.
 
 It's totally free, incredibly easy to use, and works practically everywhere.
 SABnzbd makes Usenet as simple and streamlined as possible by automating everything we can. All you have to do is add an `.nzb`. SABnzbd takes over from there, where it will be automatically downloaded, verified, repaired, extracted and filed away with zero human interaction.
-If you want to know more you can head over to our website: https://sabnzbd.org.
+If you want to know more you can head over to our website: http://sabnzbd.org.
 
 ## Resolving Dependencies
 

README.mkd

@@ -1,79 +1,67 @@
-Release Notes  -  SABnzbd 2.2.0 Release Candidate 2
+Release Notes  -  SABnzbd 2.0.0
 =========================================================
 
-NOTE: Due to changes in this release, the queue will be converted when 2.2.0
-is started for the first time. Job order, settings and data will be
-preserved, but all jobs will be unpaused and URLs that did not finish
-fetching before the upgrade will be lost!
+## New in 2.0.0: SABYenc
+- To improve SABnzbd's performance on systems where CPU power is limiting
+  download speed, we developed a new C-module called SABYenc to accelerate the
+  decoding of usenet articles that can use multiple threads and is more efficient.
+  Not only low-powered systems like NAS's or Raspberry Pi's benefit, with this
+  new module speeds can increase up to 2x compared to 1.x.x releases on any
+  system where the connection/newsserver capacity was not fully used.
+  The Windows and macOS releases automatically include this module, for other
+  platforms an installation guide can be found here: https://sabnzbd.org/sabyenc
 
-## Changes since 2.2.0 Release Candidate 1
-- Not all RAR files were correctly removed for encrypted downloads
-- Better indication of verification process before and after repair
-- All par2 files are only downloaded when enabled, not on enable_par_cleanup
-- Disk-space is now checked before writing files
-- Server usage graphs did not always list all available months
-- Warning is shown when many files with duplicate filenames are discarded
-- Special characters like []!* in filenames could break repair
-- In some cases not all RAR-sets were unpacked
-- Categories with ' in them could result in SQL errors
-- Faulty pynotify could stop shutdown
-- Various CSS fixes in Glitter and the Config
-- macOS: Really catch "Protocol wrong type for socket" errors
+## Changes/improvements in 2.0.0:
+- Windows and macOS releases now also come in 64bit versions.
+  The installers will install the appropriate version automatically.
+  Therefore, on 64bit Windows the installation directory will change to
+  'Program Files' instead of 'Program Files (x86)'.
+  On Windows our tests showed an additional 5-10% gain in download speed
+  when using 64bit SABnzbd on 64bit Windows.
+- Linux: Detect if Multicore Par2 is installed.
+  Multicore Par2 is now easily available through the PPA and other channels:
+  https://sabnzbd.org/wiki/installation/multicore-par2
+- Post-processing scripts now get additional job information via SAB environment
+  variables. https://sabnzbd.org/wiki/scripts/post-processing-scripts
+- Certificate Validation set to 'Strict' for newly added newsservers
+  The insecure Certificate Verification level 'Default' is now called 'Minimal'.
+  In case of problems, see: https://sabnzbd.org/certificate-errors
+- Removed Secondary Web Interface option.
 
-- NOTE: Option to limit Servers to specific Categories is now scheduled
-  to be removed in the next release.
+## Smaller changes/improvements in 2.0.0
+- Schedule items can now be enabled and disabled
+- HTTP-redirects in interface are now relative URL's
+- Moved some lesser used settings to Config->Specials
+- Cache usage is now updated continuously in the Status Window
+- On macOS SABnzbd was set to have low IO-priority, this is now set to normal
+- Previously set password is now shown on Retry
+- Remove listquote module dependency
+- Warn if Complete folder is on FAT filesystem (4GB size limit)
 
-## Changes since 2.1.0
-- Direct Unpack: Jobs will start unpacking during the download, reduces
-  post-processing time but requires capable hard drive. Only works for jobs that
-  do not need repair. Will be enabled if your incomplete folder-speed > 40MB/s
-- Reduced memory usage, especially with larger queues
-- Graphical overview of server-usage on Servers page
-- Notifications can now be limited to certain Categories
-- Removed 5 second delay between fetching URLs
-- Each item in the Queue and File list now has Move to Top/Bottom buttons
-- Add option to only tag a duplicate job without pausing or removing it
-- New option "History Retention" to automatically purge jobs from History
-- Jobs outside server retention are processed faster
-- Obfuscated filenames are renamed during downloading, if possible
-- Add "Retry All Failed" button to Glitter
-- Smoother animations in Firefox (disabled previously due to FF high-CPU usage)
-- Show missing articles in MB instead of number of articles
-- Correct value in "Speed" Extra History Column
-- Remove video and audio rating icons from Queue
-- Show vote buttons instead of video and audio rating buttons in History
-- If enabled, replace dots in filenames also when there are spaces already
-- Update GNTP bindings to 1.0.3
-- max_art_opt and replace_illegal moved from Switches to Specials
-- Removed Specials par2_multicore and allow_streaming
-- Windows: Full unicode support when calling repair and unpack
-- Windows: Move enable_MultiPar to Specials
-- Windows: MultiPar verification of a job is skipped after blocks are fetched
-- Windows & macOS: removed par2cmdline in favor of par2tbb/MultiPar
+## Bug fixes in 2.0.0
+- Malformed articles could break the Downloader
+- Unexpected characters in CRC part of an article could crash the Decoder
+- Retry ADMIN-data saving 3x before giving error
+- Checking for encryption during downloading could fail
+- QuickCheck could crash when renaming already renamed files
+- `skip_dashboard` set to 1 by default in `fullstatus` API-call
+- Top-only switch now really only downloads top job
+- Unblock Server button did not work
+- par2cmdline would fail to repair jobs with split posts (.001, etc)
+- Fixed QuickCheck renaming issues
+- Show warning if job is paused because it appears cloaked
+- Linux: Warn in case encoding is not set to UTF-8
+- Windows: Incomplete folders would sometimes end in a dot
 
-## Bugfixes since 2.1.0
-- Shutdown/suspend did not work on some Linux systems
-- Deleting a job could result in write errors
-- Display warning if "Extra par2 parameters" turn out to be wrong
-- RSS URLs with commas in the URL were broken
-- Fixed some "Saving failed" errors
-- Fixed crashing URLGrabber
-- Jobs with renamed files are now correctly handled when using Retry
-- Disk-space readings could be updated incorrectly
-- Correct redirect after enabling HTTPS in the Config
-- Fix race-condition in Post-processing
-- History would not always show latest changes
-- Convert HTML in error messages
-- Fixed unicode error during Sorting
-- Wizard was always accessible, even with username and password set
-- Not all texts were shown in the selected Language
-- Catch "error 0" when using HTTPS on some Linux platforms
-- Improve zeroconf/bonjour by sending HTTPS setting and auto-discover of IP
-- Windows: Fix error in MultiPar-code when first par2-file was damaged
-- macOS: Catch "Protocol wrong type for socket" errors
-
-## Translations
-- Added Hebrew translation by ION IL, many other languages updated.
+## Upgrade notices
+- Windows: When starting the Post-Processing script, the path to the job folder
+  is no longer in short-path notation but includes the full path. To support
+  long paths (>255), you might need to alter them to long-path notation (\\?\).
+- Schedule items are converted when upgrading to 2.x.x and will break when
+  reverted back to pre-2.x.x releases.
+- The organization of the download queue is different from 0.7.x releases.
+  So 2.x.x will not see the existing queue, but you can go to Status->QueueRepair
+  and "Repair" the old queue.
 
 ## Upgrading from 0.7.x and older
 - Finish queue
@@ -81,14 +69,15 @@ fetching before the upgrade will be lost!
 - Install new version
 - Start SABnzbd
 
-## Upgrade notices
-- The organization of the download queue is different from 0.7.x releases.
-  This version will not see the old queue, but you restore the jobs by going
-  to Status page and use Queue Repair.
+## IMPORTANT INFORMATION about release 2.x.x
+<https://sabnzbd.org/wiki/new-features-and-changes>
 
 ## Known problems and solutions
 - Read the file "ISSUES.txt"
 
+## Translations
+- Numerous translations updated, thanks to our translators!
+
 ## About
   SABnzbd is an open-source cross-platform binary newsreader.
   It simplifies the process of downloading from Usenet dramatically, thanks

SABnzbd.py

@@ -56,6 +56,8 @@ if [int(n) for n in cherrypy.__version__.split('.')] < [8, 1, 2]:
     print 'Sorry, requires Python module Cherrypy 8.1.2+ (use the included version)'
     sys.exit(1)
 
+from cherrypy import _cpserver
+
 SQLITE_DLL = True
 try:
     from sqlite3 import version as sqlite3_version
@@ -88,8 +90,8 @@ from sabnzbd.misc import real_path, \
     check_latest_version, exit_sab, \
     split_host, get_ext, create_https_certificates, \
     windows_variant, ip_extract, set_serv_parms, get_serv_parms, globber_full
-from sabnzbd.panic import panic_tmpl, panic_port, panic_host, \
-    panic_sqlite, panic, launch_a_browser
+from sabnzbd.panic import panic_tmpl, panic_port, panic_host, panic_fwall, \
+    panic_sqlite, panic, launch_a_browser, panic_xport
 import sabnzbd.scheduler as scheduler
 import sabnzbd.config as config
 import sabnzbd.cfg
@@ -182,6 +184,7 @@ def print_help():
     print "  -f  --config-file <ini>  Location of config file"
     print "  -s  --server <srv:port>  Listen on server:port [*]"
     print "  -t  --templates <templ>  Template directory [*]"
+    print "  -2  --template2 <templ>  Secondary template dir [*]"
     print
     print "  -l  --logging <0..2>     Set logging level (-1=off, 0= least, 2= most) [*]"
     print "  -w  --weblogging         Enable cherrypy access logging"
@@ -194,6 +197,7 @@ def print_help():
         print "      --pid <path>         Create a PID file in the given folder (full path)"
         print "      --pidfile <path>     Create a PID file with the given name (full path)"
     print
+    print "      --force              Discard web-port timeout (see Wiki!)"
     print "  -h  --help               Print this message"
     print "  -v  --version            Print version information"
     print "  -c  --clean              Remove queue, cache and logs"
@@ -202,7 +206,6 @@ def print_help():
     print "      --repair-all         Try to reconstruct the queue from the incomplete folder"
     print "                           with full data reconstruction"
     print "      --https <port>       Port to use for HTTPS server"
-    print "      --no-login           Start with username and password reset"
     print "      --log-all            Log all article handling (for developers)"
     print "      --console            Force console logging for OSX app"
     print "      --new                Run a new instance of SABnzbd"
@@ -253,7 +256,9 @@ def Bail_Out(browserhost, cherryport, err=''):
     """ Abort program because of CherryPy troubles """
     logging.error(T('Failed to start web-interface') + ' : ' + str(err))
     if not sabnzbd.DAEMON:
-        if '49' in err:
+        if '13' in err:
+            panic_xport(browserhost, cherryport)
+        elif '49' in err:
             panic_host(browserhost, cherryport)
         else:
             panic_port(browserhost, cherryport)
@@ -428,8 +433,8 @@ def print_modules():
     else:
         logging.error(T('par2 binary... NOT found!'))
 
-    if sabnzbd.newsunpack.MULTIPAR_COMMAND:
-        logging.info("MultiPar binary... found (%s)", sabnzbd.newsunpack.MULTIPAR_COMMAND)
+    if sabnzbd.newsunpack.PAR2C_COMMAND:
+        logging.info("par2cmdline binary... found (%s)", sabnzbd.newsunpack.PAR2C_COMMAND)
 
     if sabnzbd.newsunpack.RAR_COMMAND:
         logging.info("UNRAR binary... found (%s)", sabnzbd.newsunpack.RAR_COMMAND)
@@ -722,6 +727,24 @@ def evaluate_inipath(path):
             return path
 
 
+def cherrypy_logging(log_path, log_handler):
+    """ Setup CherryPy logging """
+    log = cherrypy.log
+    log.access_file = ''
+    log.error_file = ''
+    # Max size of 512KB
+    maxBytes = getattr(log, "rot_maxBytes", 524288)
+    # cherrypy.log cherrypy.log.1 cherrypy.log.2
+    backupCount = getattr(log, "rot_backupCount", 3)
+
+    # Make a new RotatingFileHandler for the error log.
+    fname = getattr(log, "rot_error_file", log_path)
+    h = log_handler(fname, 'a', maxBytes, backupCount)
+    h.setLevel(logging.DEBUG)
+    h.setFormatter(cherrypy._cplogging.logfmt)
+    log.error_log.addHandler(h)
+
+
 def commandline_handler(frozen=True):
     """ Split win32-service commands are true parameters
         Returns:
@@ -821,6 +844,7 @@ def main():
     web_dir = None
     vista_plus = False
     vista64 = False
+    force_web = False
     repair = 0
     api_url = None
     no_login = False
@@ -879,6 +903,9 @@ def main():
             exit_sab(0)
         elif opt in ('-p', '--pause'):
             pause = True
+        elif opt in ('--force',):
+            force_web = True
+            sabnzbd.RESTART_ARGS.append(opt)
         elif opt in ('--https',):
             https_port = int(arg)
             sabnzbd.RESTART_ARGS.append(opt)
@@ -996,13 +1023,13 @@ def main():
     if sabnzbd.DAEMON:
         if enable_https and https_port:
             try:
-                cherrypy.process.servers.check_port(cherryhost, https_port, timeout=0.05)
+                cherrypy.process.servers.check_port(cherryhost, https_port, timeout=0.025)
             except IOError, error:
                 Bail_Out(browserhost, cherryport)
             except:
                 Bail_Out(browserhost, cherryport, '49')
         try:
-            cherrypy.process.servers.check_port(cherryhost, cherryport, timeout=0.05)
+            cherrypy.process.servers.check_port(cherryhost, cherryport, timeout=0.025)
         except IOError, error:
             Bail_Out(browserhost, cherryport)
         except:
@@ -1015,62 +1042,58 @@ def main():
         if url and check_for_sabnzbd(url, upload_nzbs, autobrowser):
             exit_sab(0)
 
+    # If an instance of sabnzbd(same version) is already running on this port, launch the browser
+    # If another program or sabnzbd version is on this port, try 10 other ports going up in a step of 5
+    # If 'Port is not bound' (firewall) do not do anything (let the script further down deal with that).
+    notify_port_change = False
+
     # SSL
     if enable_https:
         port = https_port or cherryport
         try:
-            cherrypy.process.servers.check_port(browserhost, port, timeout=0.05)
+            cherrypy.process.servers.check_port(browserhost, port, timeout=0.025)
         except IOError, error:
             if str(error) == 'Port not bound.':
                 pass
             else:
                 if not url:
                     url = 'https://%s:%s/sabnzbd/api?' % (browserhost, port)
-                if new_instance or not check_for_sabnzbd(url, upload_nzbs, autobrowser):
-                    # Bail out if we have fixed our ports after first start-up
-                    if sabnzbd.cfg.fixed_ports():
-                        Bail_Out(browserhost, cherryport)
-                    # Find free port to bind
-                    newport = find_free_port(browserhost, port)
-                    if newport > 0:
-                        # Save the new port
-                        if https_port:
-                            https_port = newport
-                            sabnzbd.cfg.https_port.set(newport)
-                        else:
-                            # In case HTTPS == HTTP port
-                            cherryport = newport
-                            sabnzbd.cfg.port.set(newport)
+                if not sabnzbd.cfg.fixed_ports():
+                    if new_instance or not check_for_sabnzbd(url, upload_nzbs, autobrowser):
+                        newport = find_free_port(browserhost, port)
+                        if newport > 0:
+                            notify_port_change = True
+                            # Save the new port
+                            if https_port:
+                                https_port = newport
+                                sabnzbd.cfg.https_port.set(newport)
+                            else:
+                                # In case HTTPS == HTTP port
+                                http_port = newport
+                                sabnzbd.cfg.port.set(newport)
         except:
-            # Something else wrong, probably badly specified host
             Bail_Out(browserhost, cherryport, '49')
 
     # NonSSL check if there's no HTTPS or we only use 1 port
     if not (enable_https and not https_port):
         try:
-            cherrypy.process.servers.check_port(browserhost, cherryport, timeout=0.05)
+            cherrypy.process.servers.check_port(browserhost, cherryport, timeout=0.025)
         except IOError, error:
             if str(error) == 'Port not bound.':
                 pass
             else:
                 if not url:
                     url = 'http://%s:%s/sabnzbd/api?' % (browserhost, cherryport)
-                if new_instance or not check_for_sabnzbd(url, upload_nzbs, autobrowser):
-                    # Bail out if we have fixed our ports after first start-up
-                    if sabnzbd.cfg.fixed_ports():
-                        Bail_Out(browserhost, cherryport)
-                    # Find free port to bind
-                    port = find_free_port(browserhost, cherryport)
-                    if port > 0:
-                        sabnzbd.cfg.cherryport.set(port)
-                        cherryport = port
+                if not sabnzbd.cfg.fixed_ports():
+                    if new_instance or not check_for_sabnzbd(url, upload_nzbs, autobrowser):
+                        port = find_free_port(browserhost, cherryport)
+                        if port > 0:
+                            sabnzbd.cfg.cherryport.set(port)
+                            notify_port_change = True
+                            cherryport = port
         except:
-            # Something else wrong, probably badly specified host
             Bail_Out(browserhost, cherryport, '49')
 
-    # We found a port, now we never check again
-    sabnzbd.cfg.fixed_ports.set(True)
-
     if logging_level is None:
         logging_level = sabnzbd.cfg.log_level()
     else:
@@ -1330,6 +1353,7 @@ def main():
                             'error_page.404': sabnzbd.panic.error_page_404
                             })
 
+
     # Do we want CherryPy Logging? Cannot be done via the config
     if cherrypylogging:
         sabnzbd.WEBLOGFILE = os.path.join(logdir, DEF_LOG_CHERRY)
@@ -1362,6 +1386,10 @@ def main():
     # Set authentication for CherryPy
     sabnzbd.interface.set_auth(cherrypy.config)
 
+    # Notify if port was changed
+    if notify_port_change:
+        logging.warning(T('Could not bind to configured port. Port changed to %s') % cherryport)
+
     logging.info('Starting web-interface on %s:%s', cherryhost, cherryport)
 
     sabnzbd.cfg.log_level.callback(guard_loglevel)
@@ -1374,14 +1402,7 @@ def main():
 
     # Wait for server to become ready
     cherrypy.engine.wait(cherrypy.process.wspbus.states.STARTED)
-
-    # Bonjour needs a ip. Lets try to find it.
-    try:
-        z_host = socket.gethostbyname(socket.gethostname())
-    except socket.gaierror:
-        z_host = cherryhost
-
-    sabnzbd.zconfig.set_bonjour(z_host, cherryport)
+    sabnzbd.zconfig.set_bonjour(cherryhost, cherryport)
 
     mail = None
     if sabnzbd.WIN32:

cherrypy/wsgiserver/__init__.py

@@ -196,13 +196,12 @@ socket_errors_to_ignore = plat_specific_errors(
 )
 socket_errors_to_ignore.append('timed out')
 socket_errors_to_ignore.append('The read operation timed out')
+if sys.platform == 'darwin':
+    socket_errors_to_ignore.append(plat_specific_errors('EPROTOTYPE'))
+
 socket_errors_nonblocking = plat_specific_errors(
     'EAGAIN', 'EWOULDBLOCK', 'WSAEWOULDBLOCK')
 
-if sys.platform == 'darwin':
-    socket_errors_to_ignore.extend(plat_specific_errors('EPROTOTYPE'))
-    socket_errors_nonblocking.extend(plat_specific_errors('EPROTOTYPE'))
-
 comma_separated_headers = [
     ntob(h) for h in
     ['Accept', 'Accept-Charset', 'Accept-Encoding',

gntp/__init__.py

@@ -0,0 +1,509 @@
+import re
+import hashlib
+import time
+import StringIO
+
+__version__ = '0.8'
+
+#GNTP/<version> <messagetype> <encryptionAlgorithmID>[:<ivValue>][ <keyHashAlgorithmID>:<keyHash>.<salt>]
+GNTP_INFO_LINE = re.compile(
+	'GNTP/(?P<version>\d+\.\d+) (?P<messagetype>REGISTER|NOTIFY|SUBSCRIBE|\-OK|\-ERROR)' +
+	' (?P<encryptionAlgorithmID>[A-Z0-9]+(:(?P<ivValue>[A-F0-9]+))?) ?' +
+	'((?P<keyHashAlgorithmID>[A-Z0-9]+):(?P<keyHash>[A-F0-9]+).(?P<salt>[A-F0-9]+))?\r\n',
+	re.IGNORECASE
+)
+
+GNTP_INFO_LINE_SHORT = re.compile(
+	'GNTP/(?P<version>\d+\.\d+) (?P<messagetype>REGISTER|NOTIFY|SUBSCRIBE|\-OK|\-ERROR)',
+	re.IGNORECASE
+)
+
+GNTP_HEADER = re.compile('([\w-]+):(.+)')
+
+GNTP_EOL = '\r\n'
+
+
+class BaseError(Exception):
+	def gntp_error(self):
+		error = GNTPError(self.errorcode, self.errordesc)
+		return error.encode()
+
+
+class ParseError(BaseError):
+	errorcode = 500
+	errordesc = 'Error parsing the message'
+
+
+class AuthError(BaseError):
+	errorcode = 400
+	errordesc = 'Error with authorization'
+
+
+class UnsupportedError(BaseError):
+	errorcode = 500
+	errordesc = 'Currently unsupported by gntp.py'
+
+
+class _GNTPBuffer(StringIO.StringIO):
+	"""GNTP Buffer class"""
+	def writefmt(self, message="", *args):
+		"""Shortcut function for writing GNTP Headers"""
+		self.write((message % args).encode('utf8', 'replace'))
+		self.write(GNTP_EOL)
+
+
+class _GNTPBase(object):
+	"""Base initilization
+
+	:param string messagetype: GNTP Message type
+	:param string version: GNTP Protocol version
+	:param string encription: Encryption protocol
+	"""
+	def __init__(self, messagetype=None, version='1.0', encryption=None):
+		self.info = {
+			'version': version,
+			'messagetype': messagetype,
+			'encryptionAlgorithmID': encryption
+		}
+		self.headers = {}
+		self.resources = {}
+
+	def __str__(self):
+		return self.encode()
+
+	def _parse_info(self, data):
+		"""Parse the first line of a GNTP message to get security and other info values
+
+		:param string data: GNTP Message
+		:return dict: Parsed GNTP Info line
+		"""
+
+		match = GNTP_INFO_LINE.match(data)
+
+		if not match:
+			raise ParseError('ERROR_PARSING_INFO_LINE')
+
+		info = match.groupdict()
+		if info['encryptionAlgorithmID'] == 'NONE':
+			info['encryptionAlgorithmID'] = None
+
+		return info
+
+	def set_password(self, password, encryptAlgo='MD5'):
+		"""Set a password for a GNTP Message
+
+		:param string password: Null to clear password
+		:param string encryptAlgo: Supports MD5, SHA1, SHA256, SHA512
+		"""
+		hash = {
+			'MD5': hashlib.md5,
+			'SHA1': hashlib.sha1,
+			'SHA256': hashlib.sha256,
+			'SHA512': hashlib.sha512,
+		}
+
+		self.password = password
+		self.encryptAlgo = encryptAlgo.upper()
+		if not password:
+			self.info['encryptionAlgorithmID'] = None
+			self.info['keyHashAlgorithm'] = None
+			return
+		if not self.encryptAlgo in hash.keys():
+			raise UnsupportedError('INVALID HASH "%s"' % self.encryptAlgo)
+
+		hashfunction = hash.get(self.encryptAlgo)
+
+		password = password.encode('utf8')
+		seed = time.ctime()
+		salt = hashfunction(seed).hexdigest()
+		saltHash = hashfunction(seed).digest()
+		keyBasis = password + saltHash
+		key = hashfunction(keyBasis).digest()
+		keyHash = hashfunction(key).hexdigest()
+
+		self.info['keyHashAlgorithmID'] = self.encryptAlgo
+		self.info['keyHash'] = keyHash.upper()
+		self.info['salt'] = salt.upper()
+
+	def _decode_hex(self, value):
+		"""Helper function to decode hex string to `proper` hex string
+
+		:param string value: Human readable hex string
+		:return string: Hex string
+		"""
+		result = ''
+		for i in range(0, len(value), 2):
+			tmp = int(value[i:i + 2], 16)
+			result += chr(tmp)
+		return result
+
+	def _decode_binary(self, rawIdentifier, identifier):
+		rawIdentifier += '\r\n\r\n'
+		dataLength = int(identifier['Length'])
+		pointerStart = self.raw.find(rawIdentifier) + len(rawIdentifier)
+		pointerEnd = pointerStart + dataLength
+		data = self.raw[pointerStart:pointerEnd]
+		if not len(data) == dataLength:
+			raise ParseError('INVALID_DATA_LENGTH Expected: %s Recieved %s' % (dataLength, len(data)))
+		return data
+
+	def _validate_password(self, password):
+		"""Validate GNTP Message against stored password"""
+		self.password = password
+		if password == None:
+			raise AuthError('Missing password')
+		keyHash = self.info.get('keyHash', None)
+		if keyHash is None and self.password is None:
+			return True
+		if keyHash is None:
+			raise AuthError('Invalid keyHash')
+		if self.password is None:
+			raise AuthError('Missing password')
+
+		password = self.password.encode('utf8')
+		saltHash = self._decode_hex(self.info['salt'])
+
+		keyBasis = password + saltHash
+		key = hashlib.md5(keyBasis).digest()
+		keyHash = hashlib.md5(key).hexdigest()
+
+		if not keyHash.upper() == self.info['keyHash'].upper():
+			raise AuthError('Invalid Hash')
+		return True
+
+	def validate(self):
+		"""Verify required headers"""
+		for header in self._requiredHeaders:
+			if not self.headers.get(header, False):
+				raise ParseError('Missing Notification Header: ' + header)
+
+	def _format_info(self):
+		"""Generate info line for GNTP Message
+
+		:return string:
+		"""
+		info = u'GNTP/%s %s' % (
+			self.info.get('version'),
+			self.info.get('messagetype'),
+		)
+		if self.info.get('encryptionAlgorithmID', None):
+			info += ' %s:%s' % (
+				self.info.get('encryptionAlgorithmID'),
+				self.info.get('ivValue'),
+			)
+		else:
+			info += ' NONE'
+
+		if self.info.get('keyHashAlgorithmID', None):
+			info += ' %s:%s.%s' % (
+				self.info.get('keyHashAlgorithmID'),
+				self.info.get('keyHash'),
+				self.info.get('salt')
+			)
+
+		return info
+
+	def _parse_dict(self, data):
+		"""Helper function to parse blocks of GNTP headers into a dictionary
+
+		:param string data:
+		:return dict:
+		"""
+		dict = {}
+		for line in data.split('\r\n'):
+			match = GNTP_HEADER.match(line)
+			if not match:
+				continue
+
+			key = unicode(match.group(1).strip(), 'utf8', 'replace')
+			val = unicode(match.group(2).strip(), 'utf8', 'replace')
+			dict[key] = val
+		return dict
+
+	def add_header(self, key, value):
+		if isinstance(value, unicode):
+			self.headers[key] = value
+		else:
+			self.headers[key] = unicode('%s' % value, 'utf8', 'replace')
+
+	def add_resource(self, data):
+		"""Add binary resource
+
+		:param string data: Binary Data
+		"""
+		identifier = hashlib.md5(data).hexdigest()
+		self.resources[identifier] = data
+		return 'x-growl-resource://%s' % identifier
+
+	def decode(self, data, password=None):
+		"""Decode GNTP Message
+
+		:param string data:
+		"""
+		self.password = password
+		self.raw = data
+		parts = self.raw.split('\r\n\r\n')
+		self.info = self._parse_info(data)
+		self.headers = self._parse_dict(parts[0])
+
+	def encode(self):
+		"""Encode a generic GNTP Message
+
+		:return string: GNTP Message ready to be sent
+		"""
+
+		buffer = _GNTPBuffer()
+
+		buffer.writefmt(self._format_info())
+
+		#Headers
+		for k, v in self.headers.iteritems():
+			buffer.writefmt('%s: %s', k, v)
+		buffer.writefmt()
+
+		#Resources
+		for resource, data in self.resources.iteritems():
+			buffer.writefmt('Identifier: %s', resource)
+			buffer.writefmt('Length: %d', len(data))
+			buffer.writefmt()
+			buffer.write(data)
+			buffer.writefmt()
+			buffer.writefmt()
+
+		return buffer.getvalue()
+
+
+class GNTPRegister(_GNTPBase):
+	"""Represents a GNTP Registration Command
+
+	:param string data: (Optional) See decode()
+	:param string password: (Optional) Password to use while encoding/decoding messages
+	"""
+	_requiredHeaders = [
+		'Application-Name',
+		'Notifications-Count'
+	]
+	_requiredNotificationHeaders = ['Notification-Name']
+
+	def __init__(self, data=None, password=None):
+		_GNTPBase.__init__(self, 'REGISTER')
+		self.notifications = []
+
+		if data:
+			self.decode(data, password)
+		else:
+			self.set_password(password)
+			self.add_header('Application-Name', 'pygntp')
+			self.add_header('Notifications-Count', 0)
+
+	def validate(self):
+		'''Validate required headers and validate notification headers'''
+		for header in self._requiredHeaders:
+			if not self.headers.get(header, False):
+				raise ParseError('Missing Registration Header: ' + header)
+		for notice in self.notifications:
+			for header in self._requiredNotificationHeaders:
+				if not notice.get(header, False):
+					raise ParseError('Missing Notification Header: ' + header)
+
+	def decode(self, data, password):
+		"""Decode existing GNTP Registration message
+
+		:param string data: Message to decode
+		"""
+		self.raw = data
+		parts = self.raw.split('\r\n\r\n')
+		self.info = self._parse_info(data)
+		self._validate_password(password)
+		self.headers = self._parse_dict(parts[0])
+
+		for i, part in enumerate(parts):
+			if i == 0:
+				continue  # Skip Header
+			if part.strip() == '':
+				continue
+			notice = self._parse_dict(part)
+			if notice.get('Notification-Name', False):
+				self.notifications.append(notice)
+			elif notice.get('Identifier', False):
+				notice['Data'] = self._decode_binary(part, notice)
+				#open('register.png','wblol').write(notice['Data'])
+				self.resources[notice.get('Identifier')] = notice
+
+	def add_notification(self, name, enabled=True):
+		"""Add new Notification to Registration message
+
+		:param string name: Notification Name
+		:param boolean enabled: Enable this notification by default
+		"""
+		notice = {}
+		notice['Notification-Name'] = u'%s' % name
+		notice['Notification-Enabled'] = u'%s' % enabled
+
+		self.notifications.append(notice)
+		self.add_header('Notifications-Count', len(self.notifications))
+
+	def encode(self):
+		"""Encode a GNTP Registration Message
+
+		:return string: Encoded GNTP Registration message
+		"""
+
+		buffer = _GNTPBuffer()
+
+		buffer.writefmt(self._format_info())
+
+		#Headers
+		for k, v in self.headers.iteritems():
+			buffer.writefmt('%s: %s', k, v)
+		buffer.writefmt()
+
+		#Notifications
+		if len(self.notifications) > 0:
+			for notice in self.notifications:
+				for k, v in notice.iteritems():
+					buffer.writefmt('%s: %s', k, v)
+				buffer.writefmt()
+
+		#Resources
+		for resource, data in self.resources.iteritems():
+			buffer.writefmt('Identifier: %s', resource)
+			buffer.writefmt('Length: %d', len(data))
+			buffer.writefmt()
+			buffer.write(data)
+			buffer.writefmt()
+			buffer.writefmt()
+
+		return buffer.getvalue()
+
+
+class GNTPNotice(_GNTPBase):
+	"""Represents a GNTP Notification Command
+
+	:param string data: (Optional) See decode()
+	:param string app: (Optional) Set Application-Name
+	:param string name: (Optional) Set Notification-Name
+	:param string title: (Optional) Set Notification Title
+	:param string password: (Optional) Password to use while encoding/decoding messages
+	"""
+	_requiredHeaders = [
+		'Application-Name',
+		'Notification-Name',
+		'Notification-Title'
+	]
+
+	def __init__(self, data=None, app=None, name=None, title=None, password=None):
+		_GNTPBase.__init__(self, 'NOTIFY')
+
+		if data:
+			self.decode(data, password)
+		else:
+			self.set_password(password)
+			if app:
+				self.add_header('Application-Name', app)
+			if name:
+				self.add_header('Notification-Name', name)
+			if title:
+				self.add_header('Notification-Title', title)
+
+	def decode(self, data, password):
+		"""Decode existing GNTP Notification message
+
+		:param string data: Message to decode.
+		"""
+		self.raw = data
+		parts = self.raw.split('\r\n\r\n')
+		self.info = self._parse_info(data)
+		self._validate_password(password)
+		self.headers = self._parse_dict(parts[0])
+
+		for i, part in enumerate(parts):
+			if i == 0:
+				continue  # Skip Header
+			if part.strip() == '':
+				continue
+			notice = self._parse_dict(part)
+			if notice.get('Identifier', False):
+				notice['Data'] = self._decode_binary(part, notice)
+				#open('notice.png','wblol').write(notice['Data'])
+				self.resources[notice.get('Identifier')] = notice
+
+
+class GNTPSubscribe(_GNTPBase):
+	"""Represents a GNTP Subscribe Command
+
+	:param string data: (Optional) See decode()
+	:param string password: (Optional) Password to use while encoding/decoding messages
+	"""
+	_requiredHeaders = [
+		'Subscriber-ID',
+		'Subscriber-Name',
+	]
+
+	def __init__(self, data=None, password=None):
+		_GNTPBase.__init__(self, 'SUBSCRIBE')
+		if data:
+			self.decode(data, password)
+		else:
+			self.set_password(password)
+
+
+class GNTPOK(_GNTPBase):
+	"""Represents a GNTP OK Response
+
+	:param string data: (Optional) See _GNTPResponse.decode()
+	:param string action: (Optional) Set type of action the OK Response is for
+	"""
+	_requiredHeaders = ['Response-Action']
+
+	def __init__(self, data=None, action=None):
+		_GNTPBase.__init__(self, '-OK')
+		if data:
+			self.decode(data)
+		if action:
+			self.add_header('Response-Action', action)
+
+
+class GNTPError(_GNTPBase):
+	"""Represents a GNTP Error response
+
+	:param string data: (Optional) See _GNTPResponse.decode()
+	:param string errorcode: (Optional) Error code
+	:param string errordesc: (Optional) Error Description
+	"""
+	_requiredHeaders = ['Error-Code', 'Error-Description']
+
+	def __init__(self, data=None, errorcode=None, errordesc=None):
+		_GNTPBase.__init__(self, '-ERROR')
+		if data:
+			self.decode(data)
+		if errorcode:
+			self.add_header('Error-Code', errorcode)
+			self.add_header('Error-Description', errordesc)
+
+	def error(self):
+		return (self.headers.get('Error-Code', None),
+			self.headers.get('Error-Description', None))
+
+
+def parse_gntp(data, password=None):
+	"""Attempt to parse a message as a GNTP message
+
+	:param string data: Message to be parsed
+	:param string password: Optional password to be used to verify the message
+	"""
+	match = GNTP_INFO_LINE_SHORT.match(data)
+	if not match:
+		raise ParseError('INVALID_GNTP_INFO')
+	info = match.groupdict()
+	if info['messagetype'] == 'REGISTER':
+		return GNTPRegister(data, password=password)
+	elif info['messagetype'] == 'NOTIFY':
+		return GNTPNotice(data, password=password)
+	elif info['messagetype'] == 'SUBSCRIBE':
+		return GNTPSubscribe(data, password=password)
+	elif info['messagetype'] == '-OK':
+		return GNTPOK(data)
+	elif info['messagetype'] == '-ERROR':
+		return GNTPError(data)
+	raise ParseError('INVALID_GNTP_MESSAGE')

gntp/cli.py

@@ -1,141 +0,0 @@
-# Copyright: 2013 Paul Traylor
-# These sources are released under the terms of the MIT license: see LICENSE
-
-import logging
-import os
-import sys
-from optparse import OptionParser, OptionGroup
-
-from gntp.notifier import GrowlNotifier
-from gntp.shim import RawConfigParser
-from gntp.version import __version__
-
-DEFAULT_CONFIG = os.path.expanduser('~/.gntp')
-
-config = RawConfigParser({
-	'hostname': 'localhost',
-	'password': None,
-	'port': 23053,
-})
-config.read([DEFAULT_CONFIG])
-if not config.has_section('gntp'):
-	config.add_section('gntp')
-
-
-class ClientParser(OptionParser):
-	def __init__(self):
-		OptionParser.__init__(self, version="%%prog %s" % __version__)
-
-		group = OptionGroup(self, "Network Options")
-		group.add_option("-H", "--host",
-			dest="host", default=config.get('gntp', 'hostname'),
-			help="Specify a hostname to which to send a remote notification. [%default]")
-		group.add_option("--port",
-			dest="port", default=config.getint('gntp', 'port'), type="int",
-			help="port to listen on [%default]")
-		group.add_option("-P", "--password",
-			dest='password', default=config.get('gntp', 'password'),
-			help="Network password")
-		self.add_option_group(group)
-
-		group = OptionGroup(self, "Notification Options")
-		group.add_option("-n", "--name",
-			dest="app", default='Python GNTP Test Client',
-			help="Set the name of the application [%default]")
-		group.add_option("-s", "--sticky",
-			dest='sticky', default=False, action="store_true",
-			help="Make the notification sticky [%default]")
-		group.add_option("--image",
-			dest="icon", default=None,
-			help="Icon for notification (URL or /path/to/file)")
-		group.add_option("-m", "--message",
-			dest="message", default=None,
-			help="Sets the message instead of using stdin")
-		group.add_option("-p", "--priority",
-			dest="priority", default=0, type="int",
-			help="-2 to 2 [%default]")
-		group.add_option("-d", "--identifier",
-			dest="identifier",
-			help="Identifier for coalescing")
-		group.add_option("-t", "--title",
-			dest="title", default=None,
-			help="Set the title of the notification [%default]")
-		group.add_option("-N", "--notification",
-			dest="name", default='Notification',
-			help="Set the notification name [%default]")
-		group.add_option("--callback",
-			dest="callback",
-			help="URL callback")
-		self.add_option_group(group)
-
-		# Extra Options
-		self.add_option('-v', '--verbose',
-			dest='verbose', default=0, action='count',
-			help="Verbosity levels")
-
-	def parse_args(self, args=None, values=None):
-		values, args = OptionParser.parse_args(self, args, values)
-
-		if values.message is None:
-			print('Enter a message followed by Ctrl-D')
-			try:
-				message = sys.stdin.read()
-			except KeyboardInterrupt:
-				exit()
-		else:
-			message = values.message
-
-		if values.title is None:
-			values.title = ' '.join(args)
-
-		# If we still have an empty title, use the
-		# first bit of the message as the title
-		if values.title == '':
-			values.title = message[:20]
-
-		values.verbose = logging.WARNING - values.verbose * 10
-
-		return values, message
-
-
-def main():
-	(options, message) = ClientParser().parse_args()
-	logging.basicConfig(level=options.verbose)
-	if not os.path.exists(DEFAULT_CONFIG):
-		logging.info('No config read found at %s', DEFAULT_CONFIG)
-
-	growl = GrowlNotifier(
-		applicationName=options.app,
-		notifications=[options.name],
-		defaultNotifications=[options.name],
-		hostname=options.host,
-		password=options.password,
-		port=options.port,
-	)
-	result = growl.register()
-	if result is not True:
-		exit(result)
-
-	# This would likely be better placed within the growl notifier
-	# class but until I make _checkIcon smarter this is "easier"
-	if options.icon and growl._checkIcon(options.icon) is False:
-		logging.info('Loading image %s', options.icon)
-		f = open(options.icon, 'rb')
-		options.icon = f.read()
-		f.close()
-
-	result = growl.notify(
-		noteType=options.name,
-		title=options.title,
-		description=message,
-		icon=options.icon,
-		sticky=options.sticky,
-		priority=options.priority,
-		callback=options.callback,
-		identifier=options.identifier,
-	)
-	if result is not True:
-		exit(result)
-
-if __name__ == "__main__":
-	main()

gntp/config.py

@@ -1,77 +0,0 @@
-# Copyright: 2013 Paul Traylor
-# These sources are released under the terms of the MIT license: see LICENSE
-
-"""
-The gntp.config module is provided as an extended GrowlNotifier object that takes
-advantage of the ConfigParser module to allow us to setup some default values
-(such as hostname, password, and port) in a more global way to be shared among
-programs using gntp
-"""
-import logging
-import os
-
-import gntp.notifier
-import gntp.shim
-
-__all__ = [
-	'mini',
-	'GrowlNotifier'
-]
-
-logger = logging.getLogger(__name__)
-
-
-class GrowlNotifier(gntp.notifier.GrowlNotifier):
-	"""
-	ConfigParser enhanced GrowlNotifier object
-
-	For right now, we are only interested in letting users overide certain
-	values from ~/.gntp
-
-	::
-
-		[gntp]
-		hostname = ?
-		password = ?
-		port = ?
-	"""
-	def __init__(self, *args, **kwargs):
-		config = gntp.shim.RawConfigParser({
-			'hostname': kwargs.get('hostname', 'localhost'),
-			'password': kwargs.get('password'),
-			'port': kwargs.get('port', 23053),
-		})
-
-		config.read([os.path.expanduser('~/.gntp')])
-
-		# If the file does not exist, then there will be no gntp section defined
-		# and the config.get() lines below will get confused. Since we are not
-		# saving the config, it should be safe to just add it here so the
-		# code below doesn't complain
-		if not config.has_section('gntp'):
-			logger.info('Error reading ~/.gntp config file')
-			config.add_section('gntp')
-
-		kwargs['password'] = config.get('gntp', 'password')
-		kwargs['hostname'] = config.get('gntp', 'hostname')
-		kwargs['port'] = config.getint('gntp', 'port')
-
-		super(GrowlNotifier, self).__init__(*args, **kwargs)
-
-
-def mini(description, **kwargs):
-	"""Single notification function
-
-	Simple notification function in one line. Has only one required parameter
-	and attempts to use reasonable defaults for everything else
-	:param string description: Notification message
-	"""
-	kwargs['notifierFactory'] = GrowlNotifier
-	gntp.notifier.mini(description, **kwargs)
-
-
-if __name__ == '__main__':
-	# If we're running this module directly we're likely running it as a test
-	# so extra debugging is useful
-	logging.basicConfig(level=logging.INFO)
-	mini('Testing mini notification')

gntp/core.py

@@ -1,518 +0,0 @@
-# Copyright: 2013 Paul Traylor
-# These sources are released under the terms of the MIT license: see LICENSE
-
-import hashlib
-import re
-import time
-
-import gntp.shim
-import gntp.errors as errors
-
-__all__ = [
-	'GNTPRegister',
-	'GNTPNotice',
-	'GNTPSubscribe',
-	'GNTPOK',
-	'GNTPError',
-	'parse_gntp',
-]
-
-#GNTP/<version> <messagetype> <encryptionAlgorithmID>[:<ivValue>][ <keyHashAlgorithmID>:<keyHash>.<salt>]
-GNTP_INFO_LINE = re.compile(
-	'GNTP/(?P<version>\d+\.\d+) (?P<messagetype>REGISTER|NOTIFY|SUBSCRIBE|\-OK|\-ERROR)' +
-	' (?P<encryptionAlgorithmID>[A-Z0-9]+(:(?P<ivValue>[A-F0-9]+))?) ?' +
-	'((?P<keyHashAlgorithmID>[A-Z0-9]+):(?P<keyHash>[A-F0-9]+).(?P<salt>[A-F0-9]+))?\r\n',
-	re.IGNORECASE
-)
-
-GNTP_INFO_LINE_SHORT = re.compile(
-	'GNTP/(?P<version>\d+\.\d+) (?P<messagetype>REGISTER|NOTIFY|SUBSCRIBE|\-OK|\-ERROR)',
-	re.IGNORECASE
-)
-
-GNTP_HEADER = re.compile('([\w-]+):(.+)')
-
-GNTP_EOL = gntp.shim.b('\r\n')
-GNTP_SEP = gntp.shim.b(': ')
-
-
-class _GNTPBuffer(gntp.shim.StringIO):
-	"""GNTP Buffer class"""
-	def writeln(self, value=None):
-		if value:
-			self.write(gntp.shim.b(value))
-		self.write(GNTP_EOL)
-
-	def writeheader(self, key, value):
-		if not isinstance(value, str):
-			value = str(value)
-		self.write(gntp.shim.b(key))
-		self.write(GNTP_SEP)
-		self.write(gntp.shim.b(value))
-		self.write(GNTP_EOL)
-
-
-class _GNTPBase(object):
-	"""Base initilization
-
-	:param string messagetype: GNTP Message type
-	:param string version: GNTP Protocol version
-	:param string encription: Encryption protocol
-	"""
-	def __init__(self, messagetype=None, version='1.0', encryption=None):
-		self.info = {
-			'version': version,
-			'messagetype': messagetype,
-			'encryptionAlgorithmID': encryption
-		}
-		self.hash_algo = {
-			'MD5': hashlib.md5,
-			'SHA1': hashlib.sha1,
-			'SHA256': hashlib.sha256,
-			'SHA512': hashlib.sha512,
-		}
-		self.headers = {}
-		self.resources = {}
-
-	# For Python2 we can just return the bytes as is without worry
-	# but on Python3 we want to make sure we return the packet as
-	# a unicode string so that things like logging won't get confused
-	if gntp.shim.PY2:
-		def __str__(self):
-			return self.encode()
-	else:
-		def __str__(self):
-			return gntp.shim.u(self.encode())
-
-	def _parse_info(self, data):
-		"""Parse the first line of a GNTP message to get security and other info values
-
-		:param string data: GNTP Message
-		:return dict: Parsed GNTP Info line
-		"""
-
-		match = GNTP_INFO_LINE.match(data)
-
-		if not match:
-			raise errors.ParseError('ERROR_PARSING_INFO_LINE')
-
-		info = match.groupdict()
-		if info['encryptionAlgorithmID'] == 'NONE':
-			info['encryptionAlgorithmID'] = None
-
-		return info
-
-	def set_password(self, password, encryptAlgo='MD5'):
-		"""Set a password for a GNTP Message
-
-		:param string password: Null to clear password
-		:param string encryptAlgo: Supports MD5, SHA1, SHA256, SHA512
-		"""
-		if not password:
-			self.info['encryptionAlgorithmID'] = None
-			self.info['keyHashAlgorithm'] = None
-			return
-
-		self.password = gntp.shim.b(password)
-		self.encryptAlgo = encryptAlgo.upper()
-
-		if not self.encryptAlgo in self.hash_algo:
-			raise errors.UnsupportedError('INVALID HASH "%s"' % self.encryptAlgo)
-
-		hashfunction = self.hash_algo.get(self.encryptAlgo)
-
-		password = password.encode('utf8')
-		seed = time.ctime().encode('utf8')
-		salt = hashfunction(seed).hexdigest()
-		saltHash = hashfunction(seed).digest()
-		keyBasis = password + saltHash
-		key = hashfunction(keyBasis).digest()
-		keyHash = hashfunction(key).hexdigest()
-
-		self.info['keyHashAlgorithmID'] = self.encryptAlgo
-		self.info['keyHash'] = keyHash.upper()
-		self.info['salt'] = salt.upper()
-
-	def _decode_hex(self, value):
-		"""Helper function to decode hex string to `proper` hex string
-
-		:param string value: Human readable hex string
-		:return string: Hex string
-		"""
-		result = ''
-		for i in range(0, len(value), 2):
-			tmp = int(value[i:i + 2], 16)
-			result += chr(tmp)
-		return result
-
-	def _decode_binary(self, rawIdentifier, identifier):
-		rawIdentifier += '\r\n\r\n'
-		dataLength = int(identifier['Length'])
-		pointerStart = self.raw.find(rawIdentifier) + len(rawIdentifier)
-		pointerEnd = pointerStart + dataLength
-		data = self.raw[pointerStart:pointerEnd]
-		if not len(data) == dataLength:
-			raise errors.ParseError('INVALID_DATA_LENGTH Expected: %s Recieved %s' % (dataLength, len(data)))
-		return data
-
-	def _validate_password(self, password):
-		"""Validate GNTP Message against stored password"""
-		self.password = password
-		if password is None:
-			raise errors.AuthError('Missing password')
-		keyHash = self.info.get('keyHash', None)
-		if keyHash is None and self.password is None:
-			return True
-		if keyHash is None:
-			raise errors.AuthError('Invalid keyHash')
-		if self.password is None:
-			raise errors.AuthError('Missing password')
-
-		keyHashAlgorithmID = self.info.get('keyHashAlgorithmID','MD5')
-
-		password = self.password.encode('utf8')
-		saltHash = self._decode_hex(self.info['salt'])
-
-		keyBasis = password + saltHash
-		self.key = self.hash_algo[keyHashAlgorithmID](keyBasis).digest()
-		keyHash = self.hash_algo[keyHashAlgorithmID](self.key).hexdigest()
-
-		if not keyHash.upper() == self.info['keyHash'].upper():
-			raise errors.AuthError('Invalid Hash')
-		return True
-
-	def validate(self):
-		"""Verify required headers"""
-		for header in self._requiredHeaders:
-			if not self.headers.get(header, False):
-				raise errors.ParseError('Missing Notification Header: ' + header)
-
-	def _format_info(self):
-		"""Generate info line for GNTP Message
-
-		:return string:
-		"""
-		info = 'GNTP/%s %s' % (
-			self.info.get('version'),
-			self.info.get('messagetype'),
-		)
-		if self.info.get('encryptionAlgorithmID', None):
-			info += ' %s:%s' % (
-				self.info.get('encryptionAlgorithmID'),
-				self.info.get('ivValue'),
-			)
-		else:
-			info += ' NONE'
-
-		if self.info.get('keyHashAlgorithmID', None):
-			info += ' %s:%s.%s' % (
-				self.info.get('keyHashAlgorithmID'),
-				self.info.get('keyHash'),
-				self.info.get('salt')
-			)
-
-		return info
-
-	def _parse_dict(self, data):
-		"""Helper function to parse blocks of GNTP headers into a dictionary
-
-		:param string data:
-		:return dict: Dictionary of parsed GNTP Headers
-		"""
-		d = {}
-		for line in data.split('\r\n'):
-			match = GNTP_HEADER.match(line)
-			if not match:
-				continue
-
-			key = match.group(1).strip()
-			val = match.group(2).strip()
-			d[key] = val
-		return d
-
-	def add_header(self, key, value):
-		self.headers[key] = value
-
-	def add_resource(self, data):
-		"""Add binary resource
-
-		:param string data: Binary Data
-		"""
-		data = gntp.shim.b(data)
-		identifier = hashlib.md5(data).hexdigest()
-		self.resources[identifier] = data
-		return 'x-growl-resource://%s' % identifier
-
-	def decode(self, data, password=None):
-		"""Decode GNTP Message
-
-		:param string data:
-		"""
-		self.password = password
-		self.raw = gntp.shim.u(data)
-		parts = self.raw.split('\r\n\r\n')
-		self.info = self._parse_info(self.raw)
-		self.headers = self._parse_dict(parts[0])
-
-	def encode(self):
-		"""Encode a generic GNTP Message
-
-		:return string: GNTP Message ready to be sent. Returned as a byte string
-		"""
-
-		buff = _GNTPBuffer()
-
-		buff.writeln(self._format_info())
-
-		#Headers
-		for k, v in self.headers.items():
-			buff.writeheader(k, v)
-		buff.writeln()
-
-		#Resources
-		for resource, data in self.resources.items():
-			buff.writeheader('Identifier', resource)
-			buff.writeheader('Length', len(data))
-			buff.writeln()
-			buff.write(data)
-			buff.writeln()
-			buff.writeln()
-
-		return buff.getvalue()
-
-
-class GNTPRegister(_GNTPBase):
-	"""Represents a GNTP Registration Command
-
-	:param string data: (Optional) See decode()
-	:param string password: (Optional) Password to use while encoding/decoding messages
-	"""
-	_requiredHeaders = [
-		'Application-Name',
-		'Notifications-Count'
-	]
-	_requiredNotificationHeaders = ['Notification-Name']
-
-	def __init__(self, data=None, password=None):
-		_GNTPBase.__init__(self, 'REGISTER')
-		self.notifications = []
-
-		if data:
-			self.decode(data, password)
-		else:
-			self.set_password(password)
-			self.add_header('Application-Name', 'pygntp')
-			self.add_header('Notifications-Count', 0)
-
-	def validate(self):
-		'''Validate required headers and validate notification headers'''
-		for header in self._requiredHeaders:
-			if not self.headers.get(header, False):
-				raise errors.ParseError('Missing Registration Header: ' + header)
-		for notice in self.notifications:
-			for header in self._requiredNotificationHeaders:
-				if not notice.get(header, False):
-					raise errors.ParseError('Missing Notification Header: ' + header)
-
-	def decode(self, data, password):
-		"""Decode existing GNTP Registration message
-
-		:param string data: Message to decode
-		"""
-		self.raw = gntp.shim.u(data)
-		parts = self.raw.split('\r\n\r\n')
-		self.info = self._parse_info(self.raw)
-		self._validate_password(password)
-		self.headers = self._parse_dict(parts[0])
-
-		for i, part in enumerate(parts):
-			if i == 0:
-				continue  # Skip Header
-			if part.strip() == '':
-				continue
-			notice = self._parse_dict(part)
-			if notice.get('Notification-Name', False):
-				self.notifications.append(notice)
-			elif notice.get('Identifier', False):
-				notice['Data'] = self._decode_binary(part, notice)
-				#open('register.png','wblol').write(notice['Data'])
-				self.resources[notice.get('Identifier')] = notice
-
-	def add_notification(self, name, enabled=True):
-		"""Add new Notification to Registration message
-
-		:param string name: Notification Name
-		:param boolean enabled: Enable this notification by default
-		"""
-		notice = {}
-		notice['Notification-Name'] = name
-		notice['Notification-Enabled'] = enabled
-
-		self.notifications.append(notice)
-		self.add_header('Notifications-Count', len(self.notifications))
-
-	def encode(self):
-		"""Encode a GNTP Registration Message
-
-		:return string: Encoded GNTP Registration message. Returned as a byte string
-		"""
-
-		buff = _GNTPBuffer()
-
-		buff.writeln(self._format_info())
-
-		#Headers
-		for k, v in self.headers.items():
-			buff.writeheader(k, v)
-		buff.writeln()
-
-		#Notifications
-		if len(self.notifications) > 0:
-			for notice in self.notifications:
-				for k, v in notice.items():
-					buff.writeheader(k, v)
-				buff.writeln()
-
-		#Resources
-		for resource, data in self.resources.items():
-			buff.writeheader('Identifier', resource)
-			buff.writeheader('Length', len(data))
-			buff.writeln()
-			buff.write(data)
-			buff.writeln()
-			buff.writeln()
-
-		return buff.getvalue()
-
-
-class GNTPNotice(_GNTPBase):
-	"""Represents a GNTP Notification Command
-
-	:param string data: (Optional) See decode()
-	:param string app: (Optional) Set Application-Name
-	:param string name: (Optional) Set Notification-Name
-	:param string title: (Optional) Set Notification Title
-	:param string password: (Optional) Password to use while encoding/decoding messages
-	"""
-	_requiredHeaders = [
-		'Application-Name',
-		'Notification-Name',
-		'Notification-Title'
-	]
-
-	def __init__(self, data=None, app=None, name=None, title=None, password=None):
-		_GNTPBase.__init__(self, 'NOTIFY')
-
-		if data:
-			self.decode(data, password)
-		else:
-			self.set_password(password)
-			if app:
-				self.add_header('Application-Name', app)
-			if name:
-				self.add_header('Notification-Name', name)
-			if title:
-				self.add_header('Notification-Title', title)
-
-	def decode(self, data, password):
-		"""Decode existing GNTP Notification message
-
-		:param string data: Message to decode.
-		"""
-		self.raw = gntp.shim.u(data)
-		parts = self.raw.split('\r\n\r\n')
-		self.info = self._parse_info(self.raw)
-		self._validate_password(password)
-		self.headers = self._parse_dict(parts[0])
-
-		for i, part in enumerate(parts):
-			if i == 0:
-				continue  # Skip Header
-			if part.strip() == '':
-				continue
-			notice = self._parse_dict(part)
-			if notice.get('Identifier', False):
-				notice['Data'] = self._decode_binary(part, notice)
-				#open('notice.png','wblol').write(notice['Data'])
-				self.resources[notice.get('Identifier')] = notice
-
-
-class GNTPSubscribe(_GNTPBase):
-	"""Represents a GNTP Subscribe Command
-
-	:param string data: (Optional) See decode()
-	:param string password: (Optional) Password to use while encoding/decoding messages
-	"""
-	_requiredHeaders = [
-		'Subscriber-ID',
-		'Subscriber-Name',
-	]
-
-	def __init__(self, data=None, password=None):
-		_GNTPBase.__init__(self, 'SUBSCRIBE')
-		if data:
-			self.decode(data, password)
-		else:
-			self.set_password(password)
-
-
-class GNTPOK(_GNTPBase):
-	"""Represents a GNTP OK Response
-
-	:param string data: (Optional) See _GNTPResponse.decode()
-	:param string action: (Optional) Set type of action the OK Response is for
-	"""
-	_requiredHeaders = ['Response-Action']
-
-	def __init__(self, data=None, action=None):
-		_GNTPBase.__init__(self, '-OK')
-		if data:
-			self.decode(data)
-		if action:
-			self.add_header('Response-Action', action)
-
-
-class GNTPError(_GNTPBase):
-	"""Represents a GNTP Error response
-
-	:param string data: (Optional) See _GNTPResponse.decode()
-	:param string errorcode: (Optional) Error code
-	:param string errordesc: (Optional) Error Description
-	"""
-	_requiredHeaders = ['Error-Code', 'Error-Description']
-
-	def __init__(self, data=None, errorcode=None, errordesc=None):
-		_GNTPBase.__init__(self, '-ERROR')
-		if data:
-			self.decode(data)
-		if errorcode:
-			self.add_header('Error-Code', errorcode)
-			self.add_header('Error-Description', errordesc)
-
-	def error(self):
-		return (self.headers.get('Error-Code', None),
-			self.headers.get('Error-Description', None))
-
-
-def parse_gntp(data, password=None):
-	"""Attempt to parse a message as a GNTP message
-
-	:param string data: Message to be parsed
-	:param string password: Optional password to be used to verify the message
-	"""
-	data = gntp.shim.u(data)
-	match = GNTP_INFO_LINE_SHORT.match(data)
-	if not match:
-		raise errors.ParseError('INVALID_GNTP_INFO')
-	info = match.groupdict()
-	if info['messagetype'] == 'REGISTER':
-		return GNTPRegister(data, password=password)
-	elif info['messagetype'] == 'NOTIFY':
-		return GNTPNotice(data, password=password)
-	elif info['messagetype'] == 'SUBSCRIBE':
-		return GNTPSubscribe(data, password=password)
-	elif info['messagetype'] == '-OK':
-		return GNTPOK(data)
-	elif info['messagetype'] == '-ERROR':
-		return GNTPError(data)
-	raise errors.ParseError('INVALID_GNTP_MESSAGE')

gntp/errors.py

@@ -1,25 +0,0 @@
-# Copyright: 2013 Paul Traylor
-# These sources are released under the terms of the MIT license: see LICENSE
-
-class BaseError(Exception):
-	pass
-
-
-class ParseError(BaseError):
-	errorcode = 500
-	errordesc = 'Error parsing the message'
-
-
-class AuthError(BaseError):
-	errorcode = 400
-	errordesc = 'Error with authorization'
-
-
-class UnsupportedError(BaseError):
-	errorcode = 500
-	errordesc = 'Currently unsupported by gntp.py'
-
-
-class NetworkError(BaseError):
-	errorcode = 500
-	errordesc = "Error connecting to growl server"

gntp/notifier.py

@@ -1,6 +1,3 @@
-# Copyright: 2013 Paul Traylor
-# These sources are released under the terms of the MIT license: see LICENSE
-
 """
 The gntp.notifier module is provided as a simple way to send notifications
 using GNTP
@@ -12,15 +9,10 @@ using GNTP
 	`Original Python bindings <http://code.google.com/p/growl/source/browse/Bindings/python/Growl.py>`_
 
 """
+import gntp
+import socket
 import logging
 import platform
-import socket
-import sys
-
-from gntp.version import __version__
-import gntp.core
-import gntp.errors as errors
-import gntp.shim
 
 __all__ = [
 	'mini',
@@ -30,6 +22,45 @@ __all__ = [
 logger = logging.getLogger(__name__)
 
 
+def mini(description, applicationName='PythonMini', noteType="Message",
+			title="Mini Message", applicationIcon=None, hostname='localhost',
+			password=None, port=23053, sticky=False, priority=None,
+			callback=None, notificationIcon=None, identifier=None):
+	"""Single notification function
+
+	Simple notification function in one line. Has only one required parameter
+	and attempts to use reasonable defaults for everything else
+	:param string description: Notification message
+
+	.. warning::
+			For now, only URL callbacks are supported. In the future, the
+			callback argument will also support a function
+	"""
+	growl = GrowlNotifier(
+		applicationName=applicationName,
+		notifications=[noteType],
+		defaultNotifications=[noteType],
+		applicationIcon=applicationIcon,
+		hostname=hostname,
+		password=password,
+		port=port,
+	)
+	result = growl.register()
+	if result is not True:
+		return result
+
+	return growl.notify(
+		noteType=noteType,
+		title=title,
+		description=description,
+		icon=notificationIcon,
+		sticky=sticky,
+		priority=priority,
+		callback=callback,
+		identifier=identifier,
+	)
+
+
 class GrowlNotifier(object):
 	"""Helper class to simplfy sending Growl messages
 
@@ -68,9 +99,8 @@ class GrowlNotifier(object):
 		If it's a simple URL icon, then we return True. If it's a data icon
 		then we return False
 		'''
-		logger.info('Checking icon')
-
-		return gntp.shim.u(data)[:4] in ['http', 'file']
+		logger.debug('Checking icon')
+		return data.startswith('http')
 
 	def register(self):
 		"""Send GNTP Registration
@@ -79,8 +109,8 @@ class GrowlNotifier(object):
 			Before sending notifications to Growl, you need to have
 			sent a registration message at least once
 		"""
-		logger.info('Sending registration to %s:%s', self.hostname, self.port)
-		register = gntp.core.GNTPRegister()
+		logger.debug('Sending registration to %s:%s', self.hostname, self.port)
+		register = gntp.GNTPRegister()
 		register.add_header('Application-Name', self.applicationName)
 		for notification in self.notifications:
 			enabled = notification in self.defaultNotifications
@@ -89,8 +119,8 @@ class GrowlNotifier(object):
 			if self._checkIcon(self.applicationIcon):
 				register.add_header('Application-Icon', self.applicationIcon)
 			else:
-				resource = register.add_resource(self.applicationIcon)
-				register.add_header('Application-Icon', resource)
+				id = register.add_resource(self.applicationIcon)
+				register.add_header('Application-Icon', id)
 		if self.password:
 			register.set_password(self.password, self.passwordHash)
 		self.add_origin_info(register)
@@ -98,7 +128,7 @@ class GrowlNotifier(object):
 		return self._send('register', register)
 
 	def notify(self, noteType, title, description, icon=None, sticky=False,
-			priority=None, callback=None, identifier=None, custom={}):
+			priority=None, callback=None, identifier=None):
 		"""Send a GNTP notifications
 
 		.. warning::
@@ -111,16 +141,14 @@ class GrowlNotifier(object):
 		:param boolean sticky: Sticky notification
 		:param integer priority: Message priority level from -2 to 2
 		:param string callback:  URL callback
-		:param dict custom: Custom attributes. Key names should be prefixed with X-
-			according to the spec but this is not enforced by this class
 
 		.. warning::
 			For now, only URL callbacks are supported. In the future, the
 			callback argument will also support a function
 		"""
-		logger.info('Sending notification [%s] to %s:%s', noteType, self.hostname, self.port)
+		logger.debug('Sending notification [%s] to %s:%s', noteType, self.hostname, self.port)
 		assert noteType in self.notifications
-		notice = gntp.core.GNTPNotice()
+		notice = gntp.GNTPNotice()
 		notice.add_header('Application-Name', self.applicationName)
 		notice.add_header('Notification-Name', noteType)
 		notice.add_header('Notification-Title', title)
@@ -134,8 +162,8 @@ class GrowlNotifier(object):
 			if self._checkIcon(icon):
 				notice.add_header('Notification-Icon', icon)
 			else:
-				resource = notice.add_resource(icon)
-				notice.add_header('Notification-Icon', resource)
+				id = notice.add_resource(icon)
+				notice.add_header('Notification-Icon', id)
 
 		if description:
 			notice.add_header('Notification-Text', description)
@@ -144,9 +172,6 @@ class GrowlNotifier(object):
 		if identifier:
 			notice.add_header('Notification-Coalescing-ID', identifier)
 
-		for key in custom:
-			notice.add_header(key, custom[key])
-
 		self.add_origin_info(notice)
 		self.notify_hook(notice)
 
@@ -154,7 +179,7 @@ class GrowlNotifier(object):
 
 	def subscribe(self, id, name, port):
 		"""Send a Subscribe request to a remote machine"""
-		sub = gntp.core.GNTPSubscribe()
+		sub = gntp.GNTPSubscribe()
 		sub.add_header('Subscriber-ID', id)
 		sub.add_header('Subscriber-Name', name)
 		sub.add_header('Subscriber-Port', port)
@@ -170,7 +195,7 @@ class GrowlNotifier(object):
 		"""Add optional Origin headers to message"""
 		packet.add_header('Origin-Machine-Name', platform.node())
 		packet.add_header('Origin-Software-Name', 'gntp.py')
-		packet.add_header('Origin-Software-Version', __version__)
+		packet.add_header('Origin-Software-Version', gntp.__version__)
 		packet.add_header('Origin-Platform-Name', platform.system())
 		packet.add_header('Origin-Platform-Version', platform.platform())
 
@@ -189,78 +214,34 @@ class GrowlNotifier(object):
 		packet.validate()
 		data = packet.encode()
 
-		logger.debug('To : %s:%s <%s>\n%s', self.hostname, self.port, packet.__class__, data)
+		#logger.debug('To : %s:%s <%s>\n%s', self.hostname, self.port, packet.__class__, data)
+		#Less verbose
+		logger.debug('To : %s:%s <%s>', self.hostname, self.port, packet.__class__)
 
 		s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 		s.settimeout(self.socketTimeout)
-		try:
-			s.connect((self.hostname, self.port))
-			s.send(data)
-			recv_data = s.recv(1024)
-			while not recv_data.endswith(gntp.shim.b("\r\n\r\n")):
-				recv_data += s.recv(1024)
-		except socket.error:
-			# Python2.5 and Python3 compatibile exception
-			exc = sys.exc_info()[1]
-			raise errors.NetworkError(exc)
-
-		response = gntp.core.parse_gntp(recv_data)
+		s.connect((self.hostname, self.port))
+		s.send(data)
+		recv_data = s.recv(1024)
+		while not recv_data.endswith("\r\n\r\n"):
+			recv_data += s.recv(1024)
+		response = gntp.parse_gntp(recv_data)
 		s.close()
 
-		logger.debug('From : %s:%s <%s>\n%s', self.hostname, self.port, response.__class__, response)
+		#logger.debug('From : %s:%s <%s>\n%s', self.hostname, self.port, response.__class__, response)
+		#Less verbose
+		logger.debug('From : %s:%s <%s>', self.hostname, self.port, response.__class__)
 
-		if type(response) == gntp.core.GNTPOK:
+		if type(response) == gntp.GNTPOK:
+			return True
+		if response.error()[0] == '404' and 'disabled' in response.error()[1]:
+			# Ignore message saying that user has disabled this class
 			return True
 		logger.error('Invalid response: %s', response.error())
 		return response.error()
 
-
-def mini(description, applicationName='PythonMini', noteType="Message",
-			title="Mini Message", applicationIcon=None, hostname='localhost',
-			password=None, port=23053, sticky=False, priority=None,
-			callback=None, notificationIcon=None, identifier=None,
-			notifierFactory=GrowlNotifier):
-	"""Single notification function
-
-	Simple notification function in one line. Has only one required parameter
-	and attempts to use reasonable defaults for everything else
-	:param string description: Notification message
-
-	.. warning::
-			For now, only URL callbacks are supported. In the future, the
-			callback argument will also support a function
-	"""
-	try:
-		growl = notifierFactory(
-			applicationName=applicationName,
-			notifications=[noteType],
-			defaultNotifications=[noteType],
-			applicationIcon=applicationIcon,
-			hostname=hostname,
-			password=password,
-			port=port,
-		)
-		result = growl.register()
-		if result is not True:
-			return result
-
-		return growl.notify(
-			noteType=noteType,
-			title=title,
-			description=description,
-			icon=notificationIcon,
-			sticky=sticky,
-			priority=priority,
-			callback=callback,
-			identifier=identifier,
-		)
-	except Exception:
-		# We want the "mini" function to be simple and swallow Exceptions
-		# in order to be less invasive
-		logger.exception("Growl error")
-
 if __name__ == '__main__':
 	# If we're running this module directly we're likely running it as a test
 	# so extra debugging is useful
-	logging.basicConfig(level=logging.INFO)
+	logging.basicConfig(level=logging.DEBUG)
 	mini('Testing mini notification')

gntp/shim.py

@@ -1,46 +0,0 @@
-# Copyright: 2013 Paul Traylor
-# These sources are released under the terms of the MIT license: see LICENSE
-
-"""
-Python2.5 and Python3.3 compatibility shim
-
-Heavily inspirted by the "six" library.
-https://pypi.python.org/pypi/six
-"""
-
-import sys
-
-PY2 = sys.version_info[0] == 2
-PY3 = sys.version_info[0] == 3
-
-if PY3:
-	def b(s):
-		if isinstance(s, bytes):
-			return s
-		return s.encode('utf8', 'replace')
-
-	def u(s):
-		if isinstance(s, bytes):
-			return s.decode('utf8', 'replace')
-		return s
-
-	from io import BytesIO as StringIO
-	from configparser import RawConfigParser
-else:
-	def b(s):
-		if isinstance(s, unicode):
-			return s.encode('utf8', 'replace')
-		return s
-
-	def u(s):
-		if isinstance(s, unicode):
-			return s
-		if isinstance(s, int):
-			s = str(s)
-		return unicode(s, "utf8", "replace")
-
-	from StringIO import StringIO
-	from ConfigParser import RawConfigParser
-
-b.__doc__ = "Ensure we have a byte string"
-u.__doc__ = "Ensure we have a unicode string"

gntp/version.py

@@ -1,4 +0,0 @@
-# Copyright: 2013 Paul Traylor
-# These sources are released under the terms of the MIT license: see LICENSE
-
-__version__ = '1.0.3'

interfaces/Config/templates/_inc_header_uc.tmpl

@@ -22,7 +22,7 @@
     </title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no, maximum-scale=1" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="apple-mobile-web-app-title" content="SABnzbd" />
 
     <link rel="apple-touch-icon" sizes="76x76" href="${root}staticcfg/ico/apple-touch-icon-76x76-precomposed.png" />
@@ -32,9 +32,7 @@
     <link rel="apple-touch-icon" sizes="192x192" href="${root}staticcfg/ico/android-192x192.png" />
 
     <link rel="stylesheet" type="text/css" href="${root}staticcfg/bootstrap/css/bootstrap.min.css?v=$version" />
-    <link rel="stylesheet" type="text/css" href="${root}staticcfg/css/chartist.min.css" />
-    <link rel="stylesheet" type="text/css" href="${root}staticcfg/css/style.css?v=$version" />
-
+    <link rel="stylesheet" type="text/css" href="${root}staticcfg/css/style.css?p=$pid" />
     <link rel="shortcut icon" href="${root}staticcfg/ico/favicon.ico?v=$version" />
 
     <script type="text/javascript">

interfaces/Config/templates/config.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Config"#-->
-<!--#set global $help_uri="configuration/2.2/configure"#-->
+<!--#set global $help_uri="configuration/2.0/configure"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <!--#from locale import getpreferredencoding#-->
@@ -19,6 +19,10 @@
                     <th scope="row">$T('confgFile'): </th>
                     <td>$configfn</td>
                 </tr>
+                <tr>
+                    <th scope="row">$T('cache').capitalize(): </th>
+                    <td><!--#set $msg=$T('ft-buffer@2')%($cache_art, $cache_size)#-->$msg</td>
+                </tr>
                 <tr>
                     <th scope="row">$T('parameters'): </th>
                     <td>$cmdline</td>
@@ -41,16 +45,12 @@
                     </td>
                 </tr>
                 <!--#end if#-->
-                <!--#if not $nt and not $darwin#-->
+                <!--#if not $have_mt_par2#-->
                 <tr>
-                    <th scope="row">$T('opt-multicore-par2')</th>
+                    <th scope="row">Multicore Par2</th>
                     <td>
-                        <!--#if $have_mt_par2#-->
-                        <span class="glyphicon glyphicon-ok"></span>
-                        <!--#else#-->
                         <span class="label label-warning">$T('notAvailable')</span> $T('explain-getpar2mt')
                         <a href="${helpuri}installation/multicore-par2" target="_blank">${helpuri}installation/multicore-par2</a>
-                        <!--#end if#-->
                     </td>
                 </tr>
                 <!--#end if#-->
@@ -109,7 +109,7 @@
             <tbody>
                 <tr>
                     <th scope="row">$T('homePage') </th>
-                    <td><a href="https://sabnzbd.org/" target="_blank">https://sabnzbd.org/</a></td>
+                    <td><a href="http://sabnzbd.org/" target="_blank">http://sabnzbd.org/</a></td>
                 </tr>
                 <tr>
                     <th scope="row">$T('menu-wiki') </th>
@@ -117,7 +117,7 @@
                 </tr>
                 <tr>
                     <th scope="row">$T('menu-forums') </th>
-                    <td><a href="https://forums.sabnzbd.org/" target="_blank">https://forums.sabnzbd.org/</a></td>
+                    <td><a href="http://forums.sabnzbd.org/" target="_blank">http://forums.sabnzbd.org/</a></td>
                 </tr>
                 <tr>
                     <th scope="row">$T('source') </th>
@@ -131,10 +131,6 @@
                     <th scope="row">$T('menu-issues') </th>
                     <td><a href="https://sabnzbd.org/wiki/introduction/known-issues" target="_blank">https://sabnzbd.org/wiki/introduction/known-issues</a></td>
                 </tr>
-                <tr>
-                    <th scope="row">$T('menu-donate') </th>
-                    <td><a href="https://sabnzbd.org/donate" target="_blank">https://sabnzbd.org/donate</a></td>
-                </tr>
             </tbody>
         </table>
     </div>

interfaces/Config/templates/config_cat.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Categories"#-->
-<!--#set global $help_uri="configuration/2.2/categories"#-->
+<!--#set global $help_uri="configuration/2.0/categories"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 <div class="colmask">
     <div class="section">
@@ -17,7 +17,9 @@
                             <th>$T('category')</th>
                             <th>$T('priority')</th>
                             <th>$T('mode')</th>
+                            <!--#if $scripts#-->
                             <th>$T('script')</th>
+                            <!--#end if#-->
                             <th>$T('catFolderPath')</th>
                             <th colspan="2">$T('catTags')</th>
                         </tr>
@@ -59,8 +61,8 @@
                                     <option value="3" <!--#if $slot.pp=="3" then 'selected="selected"' else ""#-->>$T('pp-delete')</option>
                                 </select>
                             </td>
+                            <!--#if $scripts#-->
                             <td>
-                                <!--#if $scripts#-->
                                 <select name="script">
                                     <!--#for $sc in $scripts#-->
                                         <!--#if not ($sc == 'Default' and $slot.name == '*')#-->
@@ -68,12 +70,8 @@
                                         <!--#end if#-->
                                     <!--#end for#-->
                                 </select>
-                                <!--#else#-->
-                                <select name="script" disabled>
-
-                                </select>
-                                <!--#end if#-->
                             </td>
+                            <!--#end if#-->
                             <td class="nowrap">
                                 <input type="text" name="dir" class="fileBrowserSmall" value="$slot.dir" size="20" data-initialdir="$defdir" data-title="$T('catFolderPath')" title="$T('explain-catTags2')" />
                             </td>

interfaces/Config/templates/config_folders.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Folders"#-->
-<!--#set global $help_uri="configuration/2.2/folders"#-->
+<!--#set global $help_uri="configuration/2.0/folders"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <div class="colmask">

interfaces/Config/templates/config_general.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="General"#-->
-<!--#set global $help_uri="configuration/2.2/general"#-->
+<!--#set global $help_uri="configuration/2.0/general"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <div class="colmask">
@@ -25,7 +25,7 @@
                 </div>
                 <div class="field-pair">
                     <label class="config" for="enable_https">$T('opt-enable_https')</label>
-                    <input type="checkbox" name="enable_https" id="enable_https" value="1" <!--#if int($enable_https) > 0 then 'checked="checked" data-original="1"' else ""#-->/>
+                    <input type="checkbox" name="enable_https" id="enable_https" value="1" <!--#if int($enable_https) > 0 then 'checked="checked"' else ""#-->/>
                     <span class="desc">$T('explain-enable_https')</span>
                 </div>
                 <div class="field-pair">
@@ -240,17 +240,7 @@
             \$('.alert-translate').show()
         }
     }
-    \$('#language').on('change', function() {
-        // Show message
-        hideOrShowTranslate()
-        // Re-load page on submit
-        \$('.fullform').submit(function() {
-            // Skip the fancy stuff, just submit
-            this.submit()
-        })
-        // No JSON reponse
-        \$('#ajax').val('')
-    })
+    \$('#language').on('change', hideOrShowTranslate)
     hideOrShowTranslate()
 
     \$('#apikey, #nzbkey').click(function () { \$(this).select() });
@@ -324,20 +314,14 @@
     if(bandwidthLimit) {
         var bandwithLimitNumber = parseFloat(bandwidthLimit)
         var bandwithLimitText = bandwidthLimit.replace(/[^a-zA-Z]+/g, '');
-        if(bandwithLimitNumber) {
-            \$('#bandwidth_max_value').val(bandwithLimitNumber)
-            \$('#bandwidth_max_dropdown').val(bandwithLimitText)
-        }
+        \$('#bandwidth_max_value').val(bandwithLimitNumber)
+        \$('#bandwidth_max_dropdown').val(bandwithLimitText)
     }
 
 
     // Update the value
     \$('#bandwidth_max_value, #bandwidth_max_dropdown').on('change', function() {
-        if(\$('#bandwidth_max_value').val()) {
-            \$('#bandwidth_max').val(\$('#bandwidth_max_value').val() + \$('#bandwidth_max_dropdown').val())
-        } else {
-            \$('#bandwidth_max').val('')
-        }
+        \$('#bandwidth_max').val(\$('#bandwidth_max_value').val() + \$('#bandwidth_max_dropdown').val())
     })
 
 });

interfaces/Config/templates/config_notify.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Email"#-->
-<!--#set global $help_uri="configuration/2.2/notifications"#-->
+<!--#set global $help_uri="configuration/2.0/notifications"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <!--#def show_notify_checkboxes($section_label)#-->
@@ -13,18 +13,6 @@
     <!--#end for#-->
 <!--#end def#-->
 
-<!--#def show_cat_box($section_label)#-->
-    <div class="col2-cats" <!--#if int($getVar($section_label + '_enable')) > 0 then '' else 'style="display:none"'#-->>
-        <hr>
-        <b>$T('affectedCat')</b><br/>
-        <select name="${section_label}_cats" multiple="multiple" class="multiple_cats">
-            <!--#for $ct in $categories#-->
-                <option value="$ct" <!--#if $ct in $getVar($section_label + '_cats') then 'selected="selected"' else ""#-->>$Tspec($ct)</option>
-            <!--#end for#-->
-        </select>
-    </div>
-<!--#end def#-->
-
 <div class="colmask">
     <form action="saveEmail" method="post" name="fullform" class="fullform" autocomplete="off" novalidate>
     <input type="hidden" id="session" name="session" value="$session" />
@@ -32,15 +20,7 @@
     <div class="section" id="email">
         <div class="col2">
             <h3>$T('cmenu-email') <a href="$helpuri$help_uri#toc0" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
-            <div class="col2-cats" <!--#if int($email_endjob) > 0 then '' else 'style="display:none"'#-->>
-                <b>$T('affectedCat')</b><br/>
-                <select name="email_cats" multiple="multiple" class="multiple_cats">
-                    <!--#for $ct in $categories#-->
-                        <option value="$ct" <!--#if $ct in $email_cats then 'selected="selected"' else ""#-->>$Tspec($ct)</option>
-                    <!--#end for#-->
-                </select>
-            </div>
-        </div>
+        </div><!-- /col2 -->
         <div class="col1">
             <fieldset>
                 <div class="field-pair">
@@ -99,8 +79,8 @@
                     <div class="alert"></div>
                 </div>
             </fieldset>
-        </div>
-    </div>
+        </div><!-- /col1 -->
+    </div><!-- /section -->
     <!--#if $have_ncenter#-->
     <div class="section">
         <div class="col2">
@@ -111,7 +91,7 @@
                     <td><label for="ncenter_enable"> $T('opt-ncenter_enable')</label></td>
                 </tr>
             </table>
-        </div>
+        </div><!-- /col2 -->
         <div class="col1" <!--#if int($ncenter_enable) > 0 then '' else 'style="display:none"'#-->>
             <fieldset>
                 $show_notify_checkboxes('ncenter')
@@ -123,8 +103,8 @@
                     <div class="alert"></div>
                 </div>
            </fieldset>
-       </div>
-    </div>
+       </div><!-- /col1 -->
+    </div><!-- /section -->
     <!--#end if#-->
     <!--#if $nt#-->
     <div class="section">
@@ -136,8 +116,7 @@
                     <td><label for="acenter_enable"> $T('opt-acenter_enable')</label></td>
                 </tr>
             </table>
-            $show_cat_box('acenter')
-        </div>
+        </div><!-- /col2 -->
         <div class="col1" <!--#if int($acenter_enable) > 0 then '' else 'style="display:none"'#-->>
             <fieldset>
                 $show_notify_checkboxes('acenter')
@@ -149,8 +128,8 @@
                     <div class="alert"></div>
                 </div>
            </fieldset>
-       </div>
-    </div>
+       </div><!-- /col1 -->
+    </div><!-- /section -->
     <!--#end if#-->
     <!--#if $have_ntfosd#-->
     <div class="section">
@@ -162,8 +141,7 @@
                     <td><label for="ntfosd_enable"> $T('opt-ntfosd_enable')</label></td>
                 </tr>
             </table>
-            $show_cat_box('ntfosd')
-        </div>
+        </div><!-- /col2 -->
         <div class="col1" <!--#if int($ntfosd_enable) > 0 then '' else 'style="display:none"'#-->>
             <fieldset>
                 $show_notify_checkboxes('ntfosd')
@@ -175,48 +153,9 @@
                     <div class="alert"></div>
                 </div>
            </fieldset>
-       </div>
-    </div>
+       </div><!-- /col1 -->
+    </div><!-- /section -->
     <!--#end if#-->
-    <div class="section" id="nscript">
-        <div class="col2">
-            <h3>$T('section-NScript')</h3>
-            <table>
-                <tr>
-                    <td><input type="checkbox" name="nscript_enable" id="nscript_enable" value="1" <!--#if int($nscript_enable) > 0 then 'checked="checked"' else ""#--> /></td>
-                    <td><label for="nscript_enable"> $T('opt-nscript_enable')</label></td>
-                </tr>
-            </table>
-            <em>$T('explain-nscript_enable')</em><br><a href="$helpuri$help_uri#nscript" target="_blank">$T('readwiki')</a>
-            $show_cat_box('nscript')
-        </div>
-        <div class="col1" <!--#if int($nscript_enable) > 0 then '' else 'style="display:none"'#-->>
-            <fieldset>
-                <div class="field-pair">
-                    <label class="config" for="nscript_script">$T('opt-nscript_script')</label>
-                    <select name="nscript_script">
-                        <!--#for $sc in $scripts#-->
-                        <option value="$sc" <!--#if $nscript_script == $sc then 'selected="selected"' else ""#-->>$Tspec($sc)</option>
-                        <!--#end for#-->
-                    </select>
-                    <span class="desc">$T('explain-nscript_script')</span>
-                </div>
-                <div class="field-pair">
-                    <label class="config" for="nscript_parameters">$T('opt-nscript_parameters')</label>
-                    <input type="text" name="nscript_parameters" id="nscript_parameters" value="$nscript_parameters" />
-                    <span class="desc">$T('Optional') - $T('explain-nscript_parameters')</span>
-                </div>
-                $show_notify_checkboxes('nscript')
-                <div class="field-pair">
-                    <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
-                    <button class="btn btn-default" type="button" id="test_nscript"><span class="glyphicon glyphicon-comment"></span> $T('testNotify')</button>
-                </div>
-                <div class="field-pair result-box">
-                    <div class="alert"></div>
-                </div>
-            </fieldset>
-        </div>
-    </div>
     <div class="section" id="growl">
         <div class="col2">
             <h3>$T('growlSettings') <a href="$helpuri$help_uri#toc3" target="_blank"><span class="glyphicon glyphicon-question-sign"></span></a></h3>
@@ -226,8 +165,7 @@
                     <td><label for="growl_enable"> $T('opt-growl_enable')</label></td>
                 </tr>
             </table>
-            $show_cat_box('growl')
-        </div>
+        </div><!-- /col2 -->
         <div class="col1" <!--#if int($growl_enable) > 0 then '' else 'style="display:none"'#-->>
             <fieldset>
                 <div class="field-pair">
@@ -249,8 +187,8 @@
                     <div class="alert"></div>
                 </div>
            </fieldset>
-       </div>
-    </div>
+       </div><!-- /col1 -->
+    </div><!-- /section -->
     <div class="section" id="prowl">
         <div class="col2">
             <h3>$T('section-Prowl')</h3>
@@ -261,8 +199,7 @@
                 </tr>
             </table>
             <em>$T('explain-prowl_enable')</em>
-            $show_cat_box('prowl')
-        </div>
+        </div><!-- /col2 -->
         <div class="col1" <!--#if int($prowl_enable) > 0 then '' else 'style="display:none"'#-->>
             <fieldset>
                 <div class="field-pair">
@@ -294,8 +231,8 @@
                     <div class="alert"></div>
                 </div>
             </fieldset>
-        </div>
-    </div>
+        </div><!-- /col1 -->
+    </div><!-- /section -->
 
     <div class="section" id="pushover">
         <div class="col2">
@@ -307,8 +244,7 @@
                 </tr>
             </table>
             <em>$T('explain-pushover_enable')</em>
-            $show_cat_box('pushover')
-        </div>
+        </div><!-- /col2 -->
         <div class="col1" <!--#if int($pushover_enable) > 0 then '' else 'style="display:none"'#-->>
             <fieldset>
                 <div class="field-pair">
@@ -350,8 +286,8 @@
                     <div class="alert"></div>
                 </div>
             </fieldset>
-        </div>
-    </div>
+        </div><!-- /col1 -->
+    </div><!-- /section -->
     <div class="section" id="pushbullet">
         <div class="col2">
             <h3>$T('section-Pushbullet')</h3>
@@ -362,8 +298,7 @@
                 </tr>
             </table>
             <em>$T('explain-pushbullet_enable')</em>
-            $show_cat_box('pushbullet')
-        </div>
+        </div><!-- /col2 -->
         <div class="col1" <!--#if int($pushbullet_enable) > 0 then '' else 'style="display:none"'#-->>
             <fieldset>
                 <div class="field-pair">
@@ -387,8 +322,46 @@
                     <div class="alert"></div>
                 </div>
            </fieldset>
-       </div>
-    </div>
+       </div><!-- /col1 -->
+    </div><!-- /section -->
+    <div class="section" id="nscript">
+        <div class="col2">
+        <h3>$T('section-NScript')</h3>
+        <table>
+            <tr>
+                <td><input type="checkbox" name="nscript_enable" id="nscript_enable" value="1" <!--#if int($nscript_enable) > 0 then 'checked="checked"' else ""#--> /></td>
+                <td><label for="nscript_enable"> $T('opt-nscript_enable')</label></td>
+            </tr>
+        </table>
+        <em>$T('explain-nscript_enable')</em>
+        </div><!-- /col2 -->
+        <div class="col1" <!--#if int($nscript_enable) > 0 then '' else 'style="display:none"'#-->>
+            <fieldset>
+                <div class="field-pair">
+                    <label class="config" for="nscript_script">$T('opt-nscript_script')</label>
+                    <select name="nscript_script">
+                        <!--#for $sc in $scripts#-->
+                        <option value="$sc" <!--#if $nscript_script == $sc then 'selected="selected"' else ""#-->>$Tspec($sc)</option>
+                        <!--#end for#-->
+                    </select>
+                    <span class="desc">$T('explain-nscript_script')</span>
+                </div>
+                <div class="field-pair">
+                    <label class="config" for="nscript_parameters">$T('opt-nscript_parameters')</label>
+                    <input type="text" name="nscript_parameters" id="nscript_parameters" value="$nscript_parameters" />
+                    <span class="desc">$T('Optional') - $T('explain-nscript_parameters')</span>
+                </div>
+                $show_notify_checkboxes('nscript')
+                <div class="field-pair">
+                    <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
+                    <button class="btn btn-default" type="button" id="test_nscript"><span class="glyphicon glyphicon-comment"></span> $T('testNotify')</button>
+                </div>
+                <div class="field-pair result-box">
+                    <div class="alert"></div>
+                </div>
+            </fieldset>
+        </div><!-- /col1 -->
+    </div><!-- /section -->
     </form>
 </div><!-- /colmask -->
 
@@ -401,20 +374,11 @@
     \$('.col2 input[name$="enable"]').change(function() {
         if(this.checked) {
             \$(this).parents('.section').find('.col1').show()
-            \$(this).parents('.col2').find('.col2-cats').show()
         } else {
             \$(this).parents('.section').find('.col1').hide()
-            \$(this).parents('.col2').find('.col2-cats').hide()
         }
         \$('form').submit()
     })
-    \$('#email_endjob').change(function() {
-        if(\$(this).val() > 0) {
-            \$(this).parents('.section').find('.col2-cats').show()
-        } else {
-            \$(this).parents('.section').find('.col2-cats').hide()
-        }
-    })
 
     /**
         Testing functions

interfaces/Config/templates/config_rss.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="RSS"#-->
-<!--#set global $help_uri="configuration/2.2/rss"#-->
+<!--#set global $help_uri="configuration/2.0/rss"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 <div class="colmask">
     <!--#if not $active_feed#-->

interfaces/Config/templates/config_scheduling.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Scheduling"#-->
-<!--#set global $help_uri="configuration/2.2/scheduling"#-->
+<!--#set global $help_uri="configuration/2.0/scheduling"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <%

interfaces/Config/templates/config_server.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Servers"#-->
-<!--#set global $help_uri="configuration/2.2/servers"#-->
+<!--#set global $help_uri="configuration/2.0/servers"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <div class="colmask">
@@ -110,56 +110,6 @@
     </div><!-- /section -->
 </form>
 
-<script type="text/javascript" src="${root}staticcfg/js/chartist.min.js"></script>
-<script type="text/javascript">
-    // Define variables needed for the server-plots
-    var serverData = {}
-    var chartOptions = {
-        fullWidth: true,
-        showArea: true,
-        axisX: {
-            labelOffset: {
-                x: -5
-            },
-            showGrid: false
-        },
-        axisY: {
-            labelOffset: {
-                y: 7
-            },
-            scaleMinSpace: 30
-        },
-        chartPadding: {
-            top: 9,
-            bottom: 0,
-            left: 30,
-            right: 20
-        }
-    }
-</script>
-<!--
-    We need to find how many months we have recorded so far, so we
-     loop over all the dates to find the lowest value and then use
-     the number of days passed as an estimate of the months we have.
--->
-<!--#import json#-->
-<!--#import datetime#-->
-<!--#def show_date_selector($server, $id)#-->
-    <!--#set month_names = [$T('January'), $T('February'), $T('March'), $T('April'), $T('May'), $T('June'), $T('July'), $T('August'), $T('September'), $T('October'), $T('November'), $T('December')] #-->
-    <!--#set min_date = datetime.date.today()#-->
-    <!--#for date in $server['amounts'][4]#-->
-        <!--#set split_date = $date.split('-')#-->
-        <!--#set min_date = min(min_date, datetime.date(int(split_date[0]), int(split_date[1]), 1))#-->
-    <!--#end for#-->
-    <!--#set months_recorded = int((datetime.date.today()-min_date).days / (365/12))#-->
-    <select class="chart-selector" name="chart-selector-${id}" id="chart-selector-${id}" data-id="${id}">
-        <!--#for $i in range(months_recorded+1)#-->
-            <!--#set cur_date = (datetime.date.today() - datetime.timedelta($i*365/12))#-->
-            <option value="<!--#echo '%d-%02d' % ($cur_date.year, $cur_date.month)#-->">$month_names[$cur_date.month-1] $cur_date.year</option>
-        <!--#end for#-->
-    </select>
-<!--#end def#-->
-
 <!--#set $prio_colors = ["#59cc33", "#3366cc","#7f33cc", "#cc33a6", "#cc3333"] #-->
 <!--#set $cur_prio_color = -1 #-->
 <!--#set $last_prio = -1 #-->
@@ -258,7 +208,7 @@
                         </option>
                     <!--#end for#-->
                     </select>
-                    <span class="desc">$T('srv-explain-categories')<br><span class="label label-warning">$T('warning').upper()</span> <strong>This option is scheduled to be removed in the next release of SABnzbd.</strong></span>
+                    <span class="desc">$T('srv-explain-categories')</span>
                     <div class="alert alert-info alert-no-category">
                         <span class="glyphicon glyphicon-info-sign"></span>
                         $T('srv-explain-no-categories')
@@ -282,283 +232,165 @@
                     <div class="alert"></div>
                 </div>
             </fieldset>
+        </div><!-- /col1 -->
+        <div class="col2"  style="display:block;">
+        <!--#if 'amounts' in $server#-->
+            <b>$T('srv-bandwidth'):</b><br/>
+            $T('total'): $(server['amounts'][0])B<br/>
+            $T('today'): $(server['amounts'][3])B<br/>
+            $T('thisWeek'): $(server['amounts'][2])B<br/>
+            $T('thisMonth'): $(server['amounts'][1])B
+        <!--#end if#-->
         </div>
-        <div class="col1" style="display:block;">
-            <!--#if 'amounts' in $server#-->
-                <div class="server-amounts-text">
-                    <b>$T('srv-bandwidth'):</b><br/>
-                    $T('total'): $(server['amounts'][0])B<br/>
-                    $T('today'): $(server['amounts'][3])B<br/>
-                    $T('thisWeek'): $(server['amounts'][2])B<br/>
-                    $T('thisMonth'): $(server['amounts'][1])B
-                </div>
-                <div class="server-chart">
-                    $show_date_selector($server, $cur)
-                    <div id="server-chart-${cur}" class="ct-chart"></div>
-                </div>
-                <script type="text/javascript">
-                    // Server data
-                    serverData[${cur}] = <!--#echo json.dumps($server['amounts'][4])#-->
-                    \$(document).ready(function() {
-                        showChart(${cur})
-                    })
-                </script>
-            <!--#end if#-->
-        </div>
-    </div>
+    </div><!-- /section -->
     </form>
 <!--#end for#-->
 
 </div><!-- /colmask -->
 
 <script type="text/javascript">
-    function showChart(server_id, month) {
-        // This month
-        var thisDay = new Date()
-
-        // What month are we doing?
-        if(month) {
-            var inputDate = new Date(month+'-01')
-        } else {
-            var inputDate = new Date()
-        }
-        var baseDate = new Date(inputDate.getFullYear(), inputDate.getMonth(), 1)
-        var maxDaysInMonth = new Date(baseDate.getYear(), baseDate.getMonth()+1, 0).getDate()
-
-        // Fill the data array
-        var data = {
-            labels: [],
-            series: [[]]
-        };
-        var largestVal = 0
-        for(var i = 1; i < maxDaysInMonth+1; i++) {
-            // Add X-label
-            if(i % 3 == 1) {
-                data['labels'].push(i)
-            } else {
-                data['labels'].push(NaN)
-            }
-
-            // Get formatted date
-            baseDate.setDate(i)
-            var dateCheck = toFormattedDate(baseDate)
-
-            // Add data if we have it
-            if(dateCheck in serverData[server_id]) {
-                data['series'][0].push(serverData[server_id][dateCheck])
-                largestVal = Math.max(largestVal, serverData[server_id][dateCheck])
-            } else if(thisDay.getYear() == baseDate.getYear() && thisDay.getMonth() == baseDate.getMonth() && thisDay.getDate() < i) {
-                data['series'][0].push(NaN)
-            } else {
-                data['series'][0].push(0)
-            }
-        }
-
-        // Check if we should shrink the Y-axis values
-        var devideBy = 1024
-        var axisLabel = 'KB'
-        if(largestVal > 1024*1024) {
-            devideBy = 1024*1024
-            axisLabel = 'MB'
-        }
-        if(largestVal > 1024*1024*1024) {
-            devideBy = 1024*1024*1024
-            axisLabel = 'GB'
-        }
-        if(largestVal > 1024*1024*1024*1024) {
-            devideBy = 1024*1024*1024*1024
-            axisLabel = 'TB'
-        }
-
-        // Shrink the value
-        data['series'][0] = data['series'][0].map(function(num) {
-            return num / devideBy;
+\$(document).ready(function(){
+    // Exception when change of priority, reload
+    \$('input[name="priority"], input[name="displayname"]').on('change', function() {
+        \$('.fullform').submit(function() {
+            // Skip the fancy stuff, just submit
+            this.submit()
         })
-
-        // Show the chart
-        chart = new Chartist.Line('#server-chart-'+server_id, data, chartOptions);
-        chart.on('created', function(context) {
-            // Make sure to add this as the first child so it's at the bottom
-            context.svg.elem('rect', {
-                x: context.chartRect.x1,
-                y: context.chartRect.y2-1,
-                width: context.chartRect.width(),
-                height: context.chartRect.height()+2,
-                fill: 'none',
-                stroke: '#B9B9B9',
-                'stroke-width': '1px'
-            }, '', context.svg, true)
-            \$('#server-chart-'+server_id+' .ct-label.ct-vertical').each(function(index, elmn) {
-                elmn.innerHTML += axisLabel
-            })
-        });
-    }
-
-    // Need to mitigate timezone effects!
-    function toFormattedDate(date) {
-        var local = new Date(date);
-        local.setMinutes(date.getMinutes() - date.getTimezoneOffset());
-        return local.toJSON().slice(0, 10);
-    }
+    })
 
     /**
-        When finished loading
+        Message on no Default category selected
     **/
-    \$(document).ready(function(){
-        // Exception when change of priority, reload
-        \$('input[name="priority"], input[name="displayname"]').on('change', function() {
-            \$('.fullform').submit(function() {
-                // Skip the fancy stuff, just submit
-                this.submit()
-            })
-        })
-
-        /**
-            Update charts when changed
-        **/
-        \$('.chart-selector').on('change', function(elemn) {
-            showChart(\$(elemn.target).data('id'), \$(elemn.target).val())
-            // Lets us leave (needs to be called after the change event)
-            setTimeout(function() {
-                formWasSubmitted = true;
-                formHasChanged = false;
-            }, 100)
-        })
-
-        /**
-            Message on no Default category selected
-        **/
-        function checkServerCats() {
-            // Now we check all of them
-            var hasDefault = false;
-            // Only check the active servers, not the add-server one
-            \$('.section:not(#addServerContent) select[name="categories"]').each(function() {
-                // See if this server is enabled
-                if(!\$(this).parents('.section').find('.col2').hasClass('server-disabled') ) {
-                    // Is there Default?
-                    if(\$(this).val() && \$(this).val().indexOf('Default') > -1) {
-                        // Hide
-                        \$('.alert-no-category').hide()
-                        hasDefault = true
-                        // All good!
-                        return true
-                    }
+    function checkServerCats() {
+        // Now we check all of them
+        var hasDefault = false;
+        // Only check the active servers, not the add-server one
+        \$('.section:not(#addServerContent) select[name="categories"]').each(function() {
+            // See if this server is enabled
+            if(!\$(this).parents('.section').find('.col2').hasClass('server-disabled') ) {
+                // Is there Default?
+                if(\$(this).val() && \$(this).val().indexOf('Default') > -1) {
+                    // Hide
+                    \$('.alert-no-category').hide()
+                    hasDefault = true
+                    // All good!
+                    return true
                 }
-            })
-            // We found nothing.. Let's show a warning
-            if(!hasDefault) \$('.alert-no-category').show()
+            }
+        })
+        // We found nothing.. Let's show a warning
+        if(!hasDefault) \$('.alert-no-category').show()
+    }
+
+    \$('select[name="categories"]').on('change', checkServerCats)
+    checkServerCats()
+
+    /**
+        Click events
+    **/
+    \$('.showserver').click(function () {
+        if(\$(this).parent().hasClass('server-disabled')) {
+            \$(this).parent().parent().toggleClass('server-disabled')
         }
+        \$(this).parent().next().toggle();
+        \$(this).parent().next().next().toggle();
+        if (\$(this).attr("value") == "$T('showDetails')") {
+            \$(this).attr("value", "$T('hideDetails')");
+        } else {
+            \$(this).attr("value", "$T('showDetails')");
+        }
+    });
 
-        \$('select[name="categories"]').on('change', checkServerCats)
-        checkServerCats()
+    \$('#addServerButton').click(function(){
+        \$('#addServer').hide();
+        \$('#addServerContent').show();
+    });
 
-        /**
-            Click events
-        **/
-        \$('.showserver').click(function () {
-            if(\$(this).parent().hasClass('server-disabled')) {
-                \$(this).parent().parent().toggleClass('server-disabled')
+    \$('[name="ssl"]').click(function() {
+        // Use CSS transitions to do some highlighting
+        var portBox = \$(this).parent().parent().find('[name="port"]')
+        if(this.checked) {
+            // Enabled SSL change port when not already a custom port
+            if(portBox.val() == '119') {
+                portBox.val('563')
+                portBox.addClass('port-highlight')
             }
-            \$(this).parent().next().toggle();
-            \$(this).parent().next().next().toggle();
-            if (\$(this).attr("value") == "$T('showDetails')") {
-                \$(this).attr("value", "$T('hideDetails')");
-            } else {
-                \$(this).attr("value", "$T('showDetails')");
+        } else {
+            // Remove SSL port
+            if(portBox.val() == '563') {
+                portBox.val('119')
+                portBox.addClass('port-highlight')
             }
-        });
+        }
+        setTimeout(function() { portBox.removeClass('port-highlight') }, 2000)
+    })
 
-        \$('#addServerButton').click(function(){
-            \$('#addServer').hide();
-            \$('#addServerContent').show();
-        });
-
-        \$('[name="ssl"]').click(function() {
-            // Use CSS transitions to do some highlighting
-            var portBox = \$(this).parent().parent().find('[name="port"]')
-            if(this.checked) {
-                // Enabled SSL change port when not already a custom port
-                if(portBox.val() == '119') {
-                    portBox.val('563')
-                    portBox.addClass('port-highlight')
-                }
-            } else {
-                // Remove SSL port
-                if(portBox.val() == '563') {
-                    portBox.val('119')
-                    portBox.addClass('port-highlight')
-                }
-            }
-            setTimeout(function() { portBox.removeClass('port-highlight') }, 2000)
-        })
-
-        \$('.testServer').click(function(event){
-            removeObfuscation()
-            var theButton = \$(this)
-            var resultBox = theButton.parents('.col1').find('.result-box .alert');
-            theButton.attr("disabled", "disabled")
+    \$('.testServer').click(function(event){
+        removeObfuscation()
+        var theButton = \$(this)
+        var resultBox = theButton.parents('.col1').find('.result-box .alert');
+        theButton.attr("disabled", "disabled")
+        theButton.find('span').toggleClass('glyphicon-sort glyphicon-refresh spin-glyphicon')
+        \$.ajax({
+            type: "POST",
+            url: "../../tapi",
+            data: "mode=config&output=json&name=test_server&" + \$(this).parents('form:first').serialize()
+        }).then(function(data) {
+            // Let's replace the link
+            msg = data.value.message.replace('https://sabnzbd.org/certificate-errors', '<a href="https://sabnzbd.org/certificate-errors" class="alert-link" target="_blank">https://sabnzbd.org/certificate-errors</a>')
+            // Fill the box and enable the button
+            resultBox.removeClass('alert-success alert-danger').show()
+            resultBox.html(msg)
+            theButton.removeAttr("disabled")
             theButton.find('span').toggleClass('glyphicon-sort glyphicon-refresh spin-glyphicon')
-            \$.ajax({
-                type: "POST",
-                url: "../../tapi",
-                data: "mode=config&output=json&name=test_server&" + \$(this).parents('form:first').serialize()
-            }).then(function(data) {
-                // Let's replace the link
-                msg = data.value.message.replace('https://sabnzbd.org/certificate-errors', '<a href="https://sabnzbd.org/certificate-errors" class="alert-link" target="_blank">https://sabnzbd.org/certificate-errors</a>')
-                msg = msg.replace('-', '<br>')
-                // Fill the box and enable the button
-                resultBox.removeClass('alert-success alert-danger').show()
-                resultBox.html(msg)
-                theButton.removeAttr("disabled")
-                theButton.find('span').toggleClass('glyphicon-sort glyphicon-refresh spin-glyphicon')
 
-                // Succes or not?
-                if(data.value.result) {
-                    resultBox.addClass('alert-success')
-                    resultBox.prepend('<span class="glyphicon glyphicon-ok-sign"></span> ')
-                } else {
-                    resultBox.addClass('alert-danger')
-                    resultBox.prepend('<span class="glyphicon glyphicon-exclamation-sign"></span> ')
-                }
-            });
-        });
-
-        \$('.delServer').click(function(){
-            if( confirm("$T('Plush-confirm')") ) {
-                \$(this).parents('form:first').attr('action','delServer').submit();
-                // Let us leave!
-                formWasSubmitted = true;
-                formHasChanged = false;
-                setTimeout(function() { location.reload(); }, 500)
+            // Succes or not?
+            if(data.value.result) {
+                resultBox.addClass('alert-success')
+                resultBox.prepend('<span class="glyphicon glyphicon-ok-sign"></span> ')
+            } else {
+                resultBox.addClass('alert-danger')
+                resultBox.prepend('<span class="glyphicon glyphicon-exclamation-sign"></span> ')
             }
-            return false;
-        });
-
-        \$('.clrServer').click(function(){
-            if( confirm("$T('Plush-confirm')") ) {
-                \$(this).parents('form:first').attr('action','clrServer').submit();
-                // Let us leave!
-                formWasSubmitted = true;
-                formHasChanged = false;
-                setTimeout(function() { location.reload(); }, 500)
-            }
-            return false;
-        });
-
-        \$('.toggleServerCheckbox').click(function(){
-            var whichServer = \$(this).attr("name");
-            \$.ajax({
-                type: "POST",
-                url: "toggleServer",
-                data: {server: whichServer, session: "$session" }
-            }).done(function() {
-                // Let us leave!
-                formWasSubmitted = true;
-                formHasChanged = false;
-                setTimeout(function() { location.reload(); }, 100)
-            });
         });
     });
+
+    \$('.delServer').click(function(){
+        if( confirm("$T('Plush-confirm')") ) {
+            \$(this).parents('form:first').attr('action','delServer').submit();
+            // Let us leave!
+            formWasSubmitted = true;
+            formHasChanged = false;
+            setTimeout(function() { location.reload(); }, 500)
+        }
+        return false;
+    });
+
+    \$('.clrServer').click(function(){
+        if( confirm("$T('Plush-confirm')") ) {
+            \$(this).parents('form:first').attr('action','clrServer').submit();
+            // Let us leave!
+            formWasSubmitted = true;
+            formHasChanged = false;
+            setTimeout(function() { location.reload(); }, 500)
+        }
+        return false;
+    });
+
+    \$('.toggleServerCheckbox').click(function(){
+        var whichServer = \$(this).attr("name");
+        \$.ajax({
+            type: "POST",
+            url: "toggleServer",
+            data: {server: whichServer, session: "$session" }
+        }).done(function() {
+            // Let us leave!
+            formWasSubmitted = true;
+            formHasChanged = false;
+            setTimeout(function() { location.reload(); }, 100)
+        });
+    });
+});
 </script>
 
 <!--#include $webdir + "/_inc_footer_uc.tmpl"#-->

interfaces/Config/templates/config_sorting.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Sorting"#-->
-<!--#set global $help_uri="configuration/2.2/sorting"#-->
+<!--#set global $help_uri="configuration/2.0/sorting"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <div class="colmask">

interfaces/Config/templates/config_special.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Special"#-->
-<!--#set global $help_uri="configuration/2.2/special"#-->
+<!--#set global $help_uri="configuration/2.0/special"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <div class="colmask">

interfaces/Config/templates/config_switches.tmpl

@@ -1,5 +1,5 @@
 <!--#set global $pane="Switches"#-->
-<!--#set global $help_uri="configuration/2.2/switches"#-->
+<!--#set global $help_uri="configuration/2.0/switches"#-->
 <!--#include $webdir + "/_inc_header_uc.tmpl"#-->
 
 <div class="colmask">
@@ -31,6 +31,12 @@
                         <input type="number" name="max_art_tries" id="max_art_tries" value="$max_art_tries" min="2" max="2000" />
                         <span class="desc">$T('explain-max_art_tries')</span>
                     </div>
+                    <div class="field-pair">
+                        <label class="config" for="max_art_opt">$T('opt-max_art_opt')</label>
+                        <input type="checkbox" name="max_art_opt" id="max_art_opt" value="1" <!--#if int($max_art_opt) > 0 then 'checked="checked"' else ""#--> />
+                        <span class="desc">$T('explain-max_art_opt')</span>
+                    </div>
+
                     <div class="field-pair">
                         <label class="config" for="auto_disconnect">$T('opt-auto_disconnect')</label>
                         <input type="checkbox" name="auto_disconnect" id="auto_disconnect" value="1" <!--#if int($auto_disconnect) > 0 then 'checked="checked"' else ""#--> />
@@ -86,7 +92,6 @@
                         <label class="config" for="no_dupes">$T('opt-no_dupes')</label>
                         <select name="no_dupes" id="no_dupes">
                             <option value="0" <!--#if int($no_dupes) == 0 then 'selected="selected"' else ""#--> >$T('nodupes-off')</option>
-                            <option value="4" <!--#if int($no_dupes) == 4 then 'selected="selected"' else ""#--> >$T('nodupes-tag')</option>
                             <option value="2" <!--#if int($no_dupes) == 2 then 'selected="selected"' else ""#--> >$T('nodupes-pause')</option>
                             <option value="3" <!--#if int($no_dupes) == 3 then 'selected="selected"' else ""#--> >$T('nodupes-fail')</option>
                             <option value="1" <!--#if int($no_dupes) == 1 then 'selected="selected"' else ""#--> >$T('nodupes-ignore')</option>
@@ -97,7 +102,6 @@
                         <label class="config" for="no_series_dupes">$T('opt-no_series_dupes')</label>
                         <select name="no_series_dupes" id="no_series_dupes">
                             <option value="0" <!--#if int($no_series_dupes) == 0 then 'selected="selected"' else ""#--> >$T('nodupes-off')</option>
-                            <option value="4" <!--#if int($no_series_dupes) == 4 then 'selected="selected"' else ""#--> >$T('nodupes-tag')</option>
                             <option value="2" <!--#if int($no_series_dupes) == 2 then 'selected="selected"' else ""#--> >$T('nodupes-pause')</option>
                             <option value="3" <!--#if int($no_series_dupes) == 3 then 'selected="selected"' else ""#--> >$T('nodupes-fail')</option>
                             <option value="1" <!--#if int($no_series_dupes) == 1 then 'selected="selected"' else ""#--> >$T('nodupes-ignore')</option>
@@ -132,11 +136,6 @@
                         <input type="checkbox" name="auto_sort" id="auto_sort" value="1" <!--#if int($auto_sort) > 0 then 'checked="checked"' else ""#--> />
                         <span class="desc">$T('explain-auto_sort')</span>
                     </div>
-                    <div class="field-pair">
-                        <label class="config" for="direct_unpack">$T('opt-direct_unpack')</label>
-                        <input type="checkbox" name="direct_unpack" id="direct_unpack" value="1" <!--#if int($direct_unpack) > 0 then 'checked="checked"' else ""#--> />
-                        <span class="desc">$T('explain-direct_unpack').replace('. ', '.<br/>')</span>
-                    </div>
                     <div class="field-pair">
                         <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
                         <button class="btn btn-default restoreDefaults"><span class="glyphicon glyphicon-asterisk"></span> $T('button-restoreDefaults')</button>
@@ -160,6 +159,13 @@
                         <input type="checkbox" name="enable_all_par" id="enable_all_par" value="1" <!--#if int($enable_all_par) > 0 then 'checked="checked"' else ""#--> />
                         <span class="desc">$T('explain-enable_all_par').replace('. ', '.<br/>')</span>
                     </div>
+                    <!--#if $have_multicore#-->
+                    <div class="field-pair">
+                        <label class="config" for="par2_multicore">$T('opt-par2_multicore')</label>
+                        <input type="checkbox" name="par2_multicore" id="par2_multicore" value="1" <!--#if int($par2_multicore) > 0 then 'checked="checked"' else ""#-->  />
+                        <span class="desc">$T('explain-par2_multicore')</span>
+                    </div>
+                    <!--#end if#-->
                     <div class="field-pair">
                         <label class="config" for="par_option">$T('opt-par_option')</label>
                         <input type="text" name="par_option" id="par_option" value="$par_option" />
@@ -212,28 +218,11 @@
                         <input type="checkbox" name="ignore_samples" id="ignore_samples" value="1" <!--#if int($ignore_samples) > 0 then 'checked="checked"' else ""#--> />
                         <span class="desc">$T('explain-ignore_samples') $T('igsam-del').</span>
                     </div>
-                    <div class="field-pair">
-                        <label class="config" for="enable_meta">$T('opt-enable_meta')</label>
-                        <input type="checkbox" name="enable_meta" id="enable_meta" value="1" <!--#if int($enable_meta) > 0 then 'checked="checked"' else ""#--> />
-                        <span class="desc">$T('explain-enable_meta').replace('. ', '.<br/>')</span>
-                    </div>
                     <div class="field-pair">
                         <label class="config" for="cleanup_list">$T('opt-cleanup_list')</label>
                         <input type="text" name="cleanup_list" id="cleanup_list" value="$cleanup_list"/>
                         <span class="desc">$T('explain-cleanup_list')</span>
                     </div>
-                    <div class="field-pair">
-                        <label class="config" for="history_retention_select">$T('opt-history_retention')</label>
-                        <input type="hidden" name="history_retention" id="history_retention" value="$history_retention">
-                        <select name="history_retention_select" id="history_retention_select">
-                            <option value="0">$T('history_retention-all')</option>
-                            <option value="n">$T('history_retention-number')</option>
-                            <option value="d">$T('history_retention-days')</option>
-                            <option value="-1">$T('history_retention-none')</option>
-                        </select>
-                        <input type="number" id="history_retention_number" name="history_retention_number" min="1">
-                        <span class="desc">$T('explain-history_retention').replace('. ', '.<br/>')</span>
-                    </div>
                     <div class="field-pair">
                         <button class="btn btn-default saveButton"><span class="glyphicon glyphicon-ok"></span> $T('button-saveChanges')</button>
                         <button class="btn btn-default restoreDefaults"><span class="glyphicon glyphicon-asterisk"></span> $T('button-restoreDefaults')</button>
@@ -250,7 +239,7 @@
                     <div class="field-pair">
                         <label class="config" for="folder_rename">$T('opt-folder_rename')</label>
                         <input type="checkbox" name="folder_rename" id="folder_rename" value="1" <!--#if int($folder_rename) > 0 then 'checked="checked"' else ""#--> />
-                        <span class="desc">$T('explain-folder_rename').replace('. ', '.<br/>')</span>
+                        <span class="desc">$T('explain-folder_rename')</span>
                     </div>
                     <div class="field-pair">
                         <label class="config" for="replace_spaces">$T('opt-replace_spaces')</label>
@@ -262,6 +251,11 @@
                         <input type="checkbox" name="replace_dots" id="replace_dots" value="1" <!--#if int($replace_dots) > 0 then 'checked="checked"' else ""#--> />
                         <span class="desc">$T('explain-replace_dots')</span>
                     </div>
+                    <div class="field-pair">
+                        <label class="config" for="replace_illegal">$T('opt-replace_illegal')</label>
+                        <input type="checkbox" name="replace_illegal" id="replace_illegal" value="1" <!--#if int($replace_illegal) > 0 then 'checked="checked"' else ""#--> />
+                        <span class="desc">$T('explain-replace_illegal')</span>
+                    </div>
                     <!--#if not $nt#-->
                     <div class="field-pair">
                         <label class="config" for="sanitize_safe">$T('opt-sanitize_safe')</label>
@@ -456,53 +450,6 @@
         }
     });
 
-    \$('#history_retention_select, #history_retention_number').on('change', updateHistoryRetention)
-    function updateHistoryRetention() {
-        var retention_setting = \$('#history_retention')
-        var retention_select = \$('#history_retention_select').val()
-        var retention_number = \$('#history_retention_number')
-        // Keep all or keep none
-        if(retention_select == "0" || retention_select == "-1") {
-            retention_number.hide()
-            retention_number.val('')
-            retention_number.attr('placeholder', '')
-            retention_setting.val(retention_select)
-        } else {
-            retention_number.show()
-            // Days or number?
-            if(retention_select.indexOf("d") !== -1) {
-                retention_number.attr('placeholder', '$T('days').capitalize()')
-                if(retention_number.val()) {
-                    retention_setting.val(retention_number.val() + 'd')
-                } else if(parseInt(retention_setting.val()) > 0) {
-                    retention_number.val(parseInt(retention_setting.val()))
-                }
-            } else {
-                retention_number.attr('placeholder', '$T('history_retention-limit')')
-                if(retention_number.val()) {
-                    retention_setting.val(retention_number.val())
-                } else if(parseInt(retention_setting.val()) > 0) {
-                    retention_number.val(parseInt(retention_setting.val()))
-                }
-            }
-        }
-    }
-    // Set the history-retention settig
-    var retention_setting_value = \$('#history_retention').val()
-    if(parseInt(retention_setting_value) > 0) {
-        // Days or number?
-        if(retention_setting_value.indexOf("d") !== -1) {
-            \$('#history_retention_select').val("d")
-        } else {
-            \$('#history_retention_select').val("n")
-        }
-        \$('#history_retention_number').val(parseInt(retention_setting_value))
-    } else {
-        // Keep all or keep none
-        \$('#history_retention_select').val(retention_setting_value)
-        \$('#history_retention_number').hide()
-    }
-
     \$('.restoreDefaults').click(function(e) {
         // Get section name
         var sectionName = \$(this).parents('.section').find('.col2 h3').text().trim()

interfaces/Config/templates/login/main.tmpl

@@ -1,9 +1,9 @@
 <html lang="$active_lang">
 <head>
-    <title>SABnzbd - $T('login')</title>
+    <title>SABnzbd</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no, maximum-scale=1" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="apple-mobile-web-app-title" content="SABnzbd" />
 
     <link rel="apple-touch-icon" sizes="76x76" href="../staticcfg/ico/apple-touch-icon-76x76-precomposed.png" />

interfaces/Config/templates/staticcfg/css/style.css

@@ -137,8 +137,7 @@ input[type="checkbox"]+.desc {
     font-style: italic;
     padding: 0 1px;
 }
-.col2 p,
-.col2-cats {
+.col2 p {
     font-size: 12px;
     color: #666;
     margin: 1em 0;
@@ -619,6 +618,7 @@ h2.activeRSS {
     padding: 0 0 .5em;
 }
 .feed-row div {
+    padding-right: 10px;
     overflow:hidden;
     white-space: nowrap;
     text-overflow: ellipsis;
@@ -993,55 +993,6 @@ input[type="checkbox"] {
     opacity: 0.7;
 }
 
-.Servers .server-amounts-text {
-    width: 20%;
-    float: left;
-}
-
-.Servers .server-chart {
-    float: right;
-    width: calc(100% - 250px - 25%);
-    text-align: center;
-    position: relative;
-}
-
-.Servers .ct-series-a .ct-line {
-    stroke: #666666;
-}
-
-.Servers .ct-series-a .ct-point {
-    stroke: #666666;
-    stroke-width: 4px;
-}
-
-.Servers .ct-series-a .ct-area {
-    fill: #666666
-}
-
-.Servers .ct-label {
-    font-size: 1em;
-    color: black;
-}
-
-.Servers .chart-selector {
-    position: absolute;
-    display: block;
-    top: -7px;
-    left: 50%;
-    width: 120px;
-    margin-left: -40px;
-    min-width: initial;
-    opacity: 0.8;
-}
-
-.Servers .chart-selector:hover {
-    opacity: 1;
-}
-
-.Servers .ct-grid.ct-vertical:first-of-type {
-    display: none;
-}
-
 .advanced-settings {
     display: none;
 }
@@ -1167,7 +1118,7 @@ input[type="checkbox"] {
 
     .navbar-nav {
         /* For extra wide languages like Polish */
-        margin-right: -150px;
+        margin-right: -50px;
     }
 }
 
@@ -1219,15 +1170,6 @@ input[type="checkbox"] {
     .Servers .col2 button:first-of-type {
         margin-bottom: 0;
     }
-
-    .Servers .server-chart {
-        display: none;
-    }
-
-    .Servers .server-amounts-text {
-        padding: 0px 15px 10px;
-        width: inherit;
-    }
 }
 
 @media screen and (max-width: 768px) {

interfaces/Config/templates/staticcfg/js/script.js

@@ -228,13 +228,16 @@ function do_restart() {
     // What template
     var arrPath = window.location.pathname.split('/');
     var urlPath = (arrPath[1] == "m" || arrPath[2] == "m") ? '/sabnzbd/m/' : '/sabnzbd/';
-    var switchedHTTPS = ($('#enable_https').is(':checked') == ($('#enable_https').data('original') === undefined))
-    var portsUnchanged  = ($('#port').val() == $('#port').data('original')) && ($('#https_port').val() == $('#https_port').data('original'))
+    var switchedHTTPS = !$('#enable_https').is(':checked') && window.location.protocol == 'https:'
 
-    // Are we on settings page or did nothing change?
-    if(!$('body').hasClass('General') || (!switchedHTTPS && !portsUnchanged)) {
-        // Same as before
-        var urlTotal = window.location.origin + urlPath
+    // Are we on settings page?
+    if(!$('body').hasClass('General')) {
+        // Same as before, with fall-back in case location.origin is not supported (<IE9)
+        var urlTotal = window.location.origin ? (window.location.origin + urlPath) : window.location;
+    } else if (!switchedHTTPS && ($('#port').val() == $('#port').data('original')) && ($('#https_port').val() == $('#https_port').data('original'))) {
+        // If the http/https port config didn't change, don't try and guess the URL/port to redirect to
+        // This solves some incorrect behavior if running behind a reverse proxy
+        var urlTotal = window.location.origin ? (window.location.origin + urlPath) : window.location;
     } else {
         // Protocol and port depend on http(s) setting
         if($('#enable_https').is(':checked') && (window.location.protocol == 'https:' || !$('#https_port').val())) {
@@ -260,13 +263,8 @@ function do_restart() {
             // Keep counter of failures
             var failureCounter = 0;
 
-            // Now we try until we can connect
+            // Now we try untill we can connect
             var refreshInterval = setInterval(function() {
-                // We skip the first one
-                if(failureCounter == 0) {
-                    failureCounter = failureCounter+1;
-                    return
-                }
                 $.ajax({ url: urlTotal,
                     success: function() {
                         // Back to base
@@ -406,9 +404,6 @@ $(document).ready(function () {
     $('#enable_https').on('change', function() {
         $('.enable_https_options').toggle()
     })
-    if(!$('#enable_https').is(':checked')) {
-        $('.enable_https_options').hide()
-    }
 
     $('.advancedButton').click(function(event){
         $('.advanced-settings').toggle()

interfaces/Glitter/templates/include_history.tmpl

@@ -47,9 +47,9 @@
 
                     <!-- ko if: historyStatus.has_rating -->
                     <div class="dropdown history-ratings">
-                        <a href="#" class="name-icons hover-button" data-toggle="dropdown" onclick="keepOpen(this)">
-                            <span class="glyphicon glyphicon-thumbs-up"></span> <span data-bind="text: historyStatus.rating_avg_vote_up"></span>
-                            <span class="glyphicon glyphicon-thumbs-down"></span> <span data-bind="text: historyStatus.rating_avg_vote_down"></span>
+                        <a href="#" class="name-ratings hover-button" data-toggle="dropdown" onclick="keepOpen(this)">
+                            <span class="glyphicon glyphicon-facetime-video"></span> <span data-bind="text: historyStatus.rating_avg_video"></span>
+                            <span class="glyphicon glyphicon-volume-up"></span> <span data-bind="text: historyStatus.rating_avg_audio"></span>
                         </a>
                         <ul class="dropdown-menu history-ratings-menu">
                             <li>
@@ -206,7 +206,6 @@
     </ul>
 
     <div class="multioperations-selector" id="history-options">
-        <a href="#" class="hover-button" title="$T('link-retryAll')" data-tooltip="true" data-placement="left" data-bind="click: history.retryAllFailed"><span class="glyphicon glyphicon-repeat"></span></a>
         <a href="#" class="hover-button" title="$T('showAllHis') / $T('showFailedHis')" data-tooltip="true" data-placement="left" data-bind="click: history.toggleShowFailed, css: { 'history-options-show-failed': history.showFailed }"><span class="glyphicon glyphicon-exclamation-sign"></span></a>
         <a href="#modal-purge-history" class="hover-button" title="$T('purgeHist')" data-toggle="modal" data-tooltip="true" data-placement="left"><span class="glyphicon glyphicon-trash"></span></a>
     </div>

interfaces/Glitter/templates/include_menu.tmpl

@@ -89,7 +89,6 @@
                 </a>
                 <ul class="dropdown-menu menu-options">
                     <li><a href="#modal-help" data-toggle="modal"><span class="glyphicon glyphicon-question-sign"></span> $T('menu-help')</a></li>
-                    <li><a href="https://sabnzbd.org/donate" target="_blank"><span class="glyphicon glyphicon-heart"></span> $T('menu-donate')</a></li>
                     <!--#if $have_logout or $have_quota or $have_rss_defined or $have_watched_dir or $pp_pause_event#--><li class="divider"></li><!--#end if#-->
                     <!--#if $have_logout#--><li><a href="./login/?logout=1"><span class="glyphicon glyphicon-log-out"></span> $T('logout')</a></li><!--#end if#-->
                     <!--#if $have_quota#--><li><a href="#" data-bind="click: doQueueAction" data-mode="reset_quota">$T('link-resetQuota')</a></li><!--#end if#-->
@@ -102,7 +101,7 @@
                     <li class="divider"></li>
                     <li class="dropdown-header"><span class="glyphicon glyphicon-off"></span> $T('Glitter-onFinish'):</li>
                     <li>
-                        <select data-bind="value: onQueueFinish, event: { change: setOnQueueFinish }" class="form-control">
+                        <select data-bind="value: onQueueFinish" class="form-control">
                             <option value=""></option>
                             <optgroup label="$T('eoq-actions')">
                                 <option value="shutdown_program">$T('shutdownSab')</option>
@@ -112,11 +111,9 @@
                                 <option value="hibernate_pc">$T('hibernatePc')</option>
                                 <!--#end if#-->
                             </optgroup>
-                            <optgroup label="$T('eoq-scripts')" data-bind="visible: queue.scriptsList().length > 1">
+                            <optgroup label="$T('eoq-scripts')">
                                 <!-- ko foreach: queue.scriptsList -->
-                                    <!-- ko if: \$data != glitterTranslate.noneText -->
-                                        <option data-bind="text: \$data, attr: { value: 'script_'+\$data } " ></option>
-                                    <!-- /ko -->
+                                    <option data-bind="text: \$data, attr: { value: 'script_'+\$data } " ></option>
                                 <!-- /ko -->
                             </optgroup>
                         </select>

interfaces/Glitter/templates/include_overlays.tmpl

@@ -60,13 +60,13 @@
         <p><strong>If anything is not working as expected, or could be improved, let us know!</strong></p>
         <p><strong>If you encounter an error, please include the log file (click on <span class="glyphicon glyphicon-wrench"></span> ) when contacting us.</strong></p>
         <h4>General</h4>
-        <span class="glyphicon glyphicon-home"></span> <a href="https://forums.sabnzbd.org/" target="_blank">SABnzbd Forum</a><br />
+        <span class="glyphicon glyphicon-home"></span> <a href="http://forums.sabnzbd.org/" target="_blank">SABnzbd Forum</a><br />
         <span class="glyphicon glyphicon-plane"></span> <a href="https://github.com/sabnzbd/sabnzbd/" target="_blank">SABnzbd on Github</a><br />
         <span class="glyphicon glyphicon-globe"></span> <a href="https://translations.launchpad.net/sabnzbd" target="_blank">Translations of SABnzbd</a><br />
         <span class="glyphicon glyphicon-envelope"></span> <a href="mailto:bugs@sabnzbd.org?body=Version:%20$version%20Skin:%20Glitter">Email bugs@sabnzbd.org</a>
 
         <h4>Interface (Glitter)</h4>
-        <span class="glyphicon glyphicon-home"></span> <a href="https://forums.sabnzbd.org/viewtopic.php?f=5&amp;t=18880" target="_blank">Glitter at SABnzbd Forum</a><br />
+        <span class="glyphicon glyphicon-home"></span> <a href="http://forums.sabnzbd.org/viewtopic.php?f=5&amp;t=18880" target="_blank">Glitter at SABnzbd Forum</a><br />
         <span class="glyphicon glyphicon-envelope"></span> <a href="mailto:safihre@sabnzbd.org?body=Version:%20$version">Email safihre@sabnzbd.org</a>
     </div>
 </div>
@@ -184,7 +184,7 @@
                                     <div class="col-sm-6">$T('swtag-server')</div>
                                     <div class="col-sm-6">
                                         <span data-bind="text: servername"></span>
-                                        <span class="label label-warning" data-bind="visible: serveroptional">$T('optional').capitalize()</span>
+                                        <span class="label label-default" data-bind="visible: serveroptional">$T('optional').capitalize()</span>
                                     </div>
                                 </div>
                                 <div class="row">
@@ -525,14 +525,10 @@
                                             <div class="progress-bar progress-bar-info" data-bind="attr: { 'style': 'width: '+percentage()+'; background-color: ' + \$parent.filelist.currentItem.progressColor() + ';' }">
                                                 <input type="checkbox" data-bind="attr: { 'name' : nzf_id }, disable: !canselect(), click : \$parent.filelist.checkSelectRange" title="$T('Glitter-multiSelect')" />
                                                 <strong data-bind="text: percentage"></strong>
-                                                <div class="fileDetails">
+                                                <span>
                                                     <span data-bind="truncatedTextCenter: filename"></span>
-                                                    <div class="fileControls">
-                                                        <a href="#" data-bind="click: \$parent.filelist.moveButton" class="hover-button buttonMoveToTop" title="$T('Glitter-top')"><span class="glyphicon glyphicon-chevron-up"></span></a>
-                                                        <a href="#" data-bind="click: \$parent.filelist.moveButton" class="hover-button buttonMoveToBottom" title="$T('Glitter-bottom')"><span class="glyphicon glyphicon-chevron-down"></span></a>
-                                                    </div>
                                                     <small>(<span data-bind="text: file_age"></span> - <span data-bind="text: mb"></span> MB)</small>
-                                                </div>
+                                                </span>
                                             </div>
                                         </div>
                                     </td>
@@ -625,7 +621,7 @@
                         </tr>
                         <tr>
                             <td><strong>$T('menu-forums'):</strong></td>
-                            <td><a href="https://forums.sabnzbd.org/" target="_blank">https://forums.sabnzbd.org/</a></td>
+                            <td><a href="http://forums.sabnzbd.org/" target="_blank">http://forums.sabnzbd.org/</a></td>
                         </tr>
                         <tr>
                             <td><strong>GitHub:</strong></td>
@@ -633,7 +629,7 @@
                         </tr>
                         <tr>
                             <td><strong>$T('menu-irc'):</strong></td>
-                            <td><a href="https://sabnzbd.org/live-chat" target="_blank">https://sabnzbd.org/live-chat</a></td>
+                            <td><a href="http://www.sabnzbd.org/live-chat/" target="_blank">http://www.sabnzbd.org/live-chat/</a></td>
                         </tr>
                     </tbody>
                 </table>

interfaces/Glitter/templates/include_queue.tmpl

@@ -95,18 +95,19 @@
                             <span data-bind="text: password"></span>
                         </small>
                         <!-- /ko -->
-                        <div class="name-icons direct-unpack hover-button" data-bind="visible: direct_unpack">
-                            <span class="glyphicon glyphicon-compressed"></span> <span data-bind="text: direct_unpack"></span>
+                        <!-- ko if: (rating_avg_video() !== false)  -->
+                        <div class="name-ratings hover-button">
+                            <span class="glyphicon glyphicon-facetime-video"></span> <span data-bind="text: rating_avg_video"></span>
+                            <span class="glyphicon glyphicon-volume-up"></span> <span data-bind="text: rating_avg_audio"></span>
                         </div>
+                        <!-- /ko -->
                     </div>
                     <form data-bind="submit: editingNameSubmit">
                         <input type="text" data-bind="value: nameForEdit, visible: editingName(), hasfocus: editingName" />
                     </form>
-                    <div class="name-options" data-bind="visible: !editingName(), css: { disabled: isGrabbing() }">
-                        <a href="#" data-bind="click: \$parent.queue.moveButton" class="hover-button buttonMoveToTop" title="$T('Glitter-top')"><span class="glyphicon glyphicon-chevron-up"></span></a>
-                        <a href="#" data-bind="click: \$parent.queue.moveButton" class="hover-button buttonMoveToBottom" title="$T('Glitter-bottom')"><span class="glyphicon glyphicon-chevron-down"></span></a>
-                        <a href="#" data-bind="click: editName" class="hover-button" title="$T('Glitter-rename')"><span class="glyphicon glyphicon-pencil"></span></a>
-                        <a href="#" data-bind="click: showFiles" class="hover-button" title="$T('nzoDetails') - $T('srv-password')"><span class="glyphicon glyphicon-folder-open"></span></a>
+                    <div class="name-options" data-bind="visible: !editingName()">
+                        <a href="#" data-bind="click: editName, css: { disabled: isGrabbing() }" class="hover-button"><span class="glyphicon glyphicon-pencil"></span></a>
+                        <a href="#" data-bind="click: showFiles, css: { disabled: isGrabbing() }" class="hover-button" title="$T('nzoDetails') - $T('srv-password')"><span class="glyphicon glyphicon-folder-open"></span></a>
                         <small data-bind="text: avg_age"></small>
                     </div>
                 </td>

interfaces/Glitter/templates/main.tmpl

@@ -16,7 +16,7 @@
         <title data-bind="text: title">SABnzbd</title>
 
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no, maximum-scale=1" />
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
         <meta name="mobile-web-app-capable" content="yes" />
         <meta name="application-name" content="SABnzbd">
         <meta name="apple-mobile-web-app-capable" content="yes" />
@@ -30,13 +30,13 @@
         <link rel="apple-touch-icon" sizes="152x152" href="./staticcfg/ico/apple-touch-icon-152x152-precomposed.png" />
         <link rel="apple-touch-icon" sizes="180x180" href="./staticcfg/ico/apple-touch-icon-180x180-precomposed.png" />
         <link rel="apple-touch-icon" sizes="192x192" href="./staticcfg/ico/android-192x192.png" />
-        <link rel="shortcut icon" type="image/ico" href="./staticcfg/ico/favicon.ico?v=$version" data-bind="attr: { 'href': SABIcon }" />
+        <link rel="shortcut icon" type="image/ico" href="./staticcfg/ico/favicon.ico?v=1.0.0" data-bind="attr: { 'href': SABIcon }" />
 
-        <link rel="stylesheet" type="text/css" href="./static/bootstrap/css/bootstrap.min.css?v=$version" />
-        <link rel="stylesheet" type="text/css" href="./static/stylesheets/glitter.css?v=$version" />
-        <link rel="stylesheet" type="text/css" href="./static/stylesheets/glitter.mobile.css?v=$version" media="all and (max-width: 768px)" />
+        <link rel="stylesheet" type="text/css" href="./static/bootstrap/css/bootstrap.min.css?p=$pid" />
+        <link rel="stylesheet" type="text/css" href="./static/stylesheets/glitter.css?p=$pid" />
+        <link rel="stylesheet" type="text/css" href="./static/stylesheets/glitter.mobile.css?p=$pid" media="all and (max-width: 768px)" />
         <!--#if $color_scheme not in ('Default', '') #-->
-        <link rel="stylesheet" type="text/css" href="./static/stylesheets/colorschemes/${color_scheme}.css?v=$version"/>
+        <link rel="stylesheet" type="text/css" href="./static/stylesheets/colorschemes/${color_scheme}.css?p=$pid"/>
         <!--#end if#-->
 
         <!-- Make translations available in scripts -->
@@ -58,11 +58,10 @@
             glitterTranslate.pauseFor = "$T('pauseFor')"
             glitterTranslate.minutes = "$T('mins')"
             glitterTranslate.shutdown = "$T('shutdownOK?')";
-            glitterTranslate.restart = "$T('explain-Restart') $T('explain-needNewLogin')".replace(/\<br(\s*\/|)\>/g, '\n');
-            glitterTranslate.repair = "$T('explain-Repair')".replace(/<br \/>/g, "\n").replace(/&quot;/g,'"');
+            glitterTranslate.restart = "$T('explain-Restart')".replace(/<br \/>/g, "\n");
+            glitterTranslate.repair = "$T('explain-Repair')".replace(/<br \/>/g, "\n");
             glitterTranslate.removeDown = "$T('Glitter-confirmClearDownloads')";
             glitterTranslate.removeDow1 = "$T('Glitter-confirmClear1Download')";
-            glitterTranslate.retryAll = "$T('link-retryAll')?";
             glitterTranslate.encrypted = "$T('Glitter-encrypted')";
             glitterTranslate.duplicate = "$T('Glitter-duplicate')";
             glitterTranslate.tooLarge = "$T('Glitter-tooLarge')";
@@ -126,7 +125,7 @@
             <!--#include raw $webdir + "/static/javascripts/jquery.min.js"#-->
             <!--#include raw $webdir + "/static/javascripts/jquery-ui.min.js"#-->
             <!--#include raw $webdir + "/static/javascripts/jquery.peity.min.js"#-->
-            <!--#include raw $webdir + "/static/javascripts/moment.min.js"#-->
+            <!--#include raw $webdir + "/static/javascripts/moment.js"#-->
             <!--#include raw $webdir + "/static/javascripts/knockout-latest.js"#-->
             <!--#include raw $webdir + "/static/javascripts/knockout-extensions.js"#-->
             <!--#include raw $webdir + "/static/bootstrap/js/bootstrap.min.js"#-->

interfaces/Glitter/templates/static/javascripts/glitter.filelist.pagination.js

@@ -35,30 +35,6 @@ function Fileslisting(parent) {
         })
     }
 
-    // Move to top and bottom buttons
-    self.moveButton = function (item,event) {
-        var targetRow, sourceRow, tbody;
-        sourceRow = $(event.currentTarget).parents("tr").filter(":first");
-        tbody = sourceRow.parents("tbody").filter(":first");
-        ko.utils.domData.set(sourceRow[0], "ko_sourceIndex", ko.utils.arrayIndexOf(sourceRow.parent().children(), sourceRow[0]));
-        sourceRow = sourceRow.detach();
-        if ($(event.currentTarget).is(".buttonMoveToTop")) {
-            // we are moving to the top
-            targetRow = tbody.children(".files-done").filter(":last");
-        } else {
-            //we are moving to the bottom
-            targetRow = tbody.children(".files-sortable").filter(":last");
-        }
-        if(targetRow.length < 1 ){
-        // we found an edge case and need to do something special
-            targetRow = tbody.children(".files-sortable").filter(":first");
-            sourceRow.insertBefore(targetRow[0]);
-        } else {
-            sourceRow.insertAfter($(targetRow[0]));
-        }
-        tbody.sortable('option', 'update').call(tbody[0],null, { item: sourceRow });
-    };
-
     // Trigger update
     self.triggerUpdate = function() {
         // Call API
@@ -221,9 +197,9 @@ function FileslistingModel(parent, data) {
     self.nzf_id = ko.observable(data.nzf_id);
     self.file_age = ko.observable(data.age);
     self.mb = ko.observable(data.mb);
+    self.percentage = ko.observable(fixPercentages((100 - (data.mbleft / data.mb * 100)).toFixed(0)));
     self.canselect = ko.observable(data.status != "finished" && data.status != "queued");
     self.isdone =  ko.observable(data.status == "finished");
-    self.percentage = ko.observable(self.isdone() ? fixPercentages(100) : fixPercentages((100 - (data.mbleft / data.mb * 100)).toFixed(0)));
 
     // Update internally
     self.updateFromData = function(data) {
@@ -231,10 +207,9 @@ function FileslistingModel(parent, data) {
         self.nzf_id(data.nzf_id)
         self.file_age(data.age)
         self.mb(data.mb)
+        self.percentage(fixPercentages((100 - (data.mbleft / data.mb * 100)).toFixed(0)));
         self.canselect(data.status != "finished" && data.status != "queued")
         self.isdone(data.status == "finished")
-        // Data is given in MB, would always show 0% for small files even if completed
-        self.percentage(self.isdone() ? fixPercentages(100) : fixPercentages((100 - (data.mbleft / data.mb * 100)).toFixed(0)))
     }
 }
 

interfaces/Glitter/templates/static/javascripts/glitter.history.js

@@ -169,6 +169,7 @@ function HistoryListModel(parent) {
 
     // Toggle showing failed
     self.toggleShowFailed = function(data, event) {
+
         // Set the loader so it doesn't flicker and then switch
         self.isLoading(true)
         self.showFailed(!self.showFailed())
@@ -176,20 +177,7 @@ function HistoryListModel(parent) {
         $('#history-options a').tooltip('hide')
         // Force refresh
         self.parent.refresh(true)
-    }
 
-    // Retry all failed
-    self.retryAllFailed = function(data, event) {
-        // Ask to be sure
-        if(confirm(glitterTranslate.retryAll)) {
-            // Send the command
-            callAPI({
-                mode: 'retry_all'
-            }).then(function() {
-                // Force refresh
-                self.parent.refresh(true)
-            })
-        }
     }
 
     // Empty history options
@@ -309,11 +297,11 @@ function HistoryModel(parent, data) {
     self.processingDownload = ko.pureComputed(function() {
         var status = self.status();
         // When we can cancel
-        if (status === 'Extracting' || status === 'Verifying' || status == 'Repairing' || status === 'Running') {
+        if (status === 'Extracting' || status === 'Verifying' || status == 'Repairing') {
             return 2
         }
         // These cannot be cancelled
-        if(status === 'Moving') {
+        if(status === 'Moving' ||  status === 'Running') {
             return 1
         }
         return false;
@@ -340,14 +328,16 @@ function HistoryModel(parent, data) {
             case 'speed':
                 // Anything to calculate?
                 if(self.historyStatus.bytes() > 0 && self.historyStatus.download_time() > 0) {
-                    try {
-                        // Extract the Download section
-                        var downloadLog = ko.utils.arrayFirst(self.historyStatus.stage_log(), function(item) {
-                            return item.name() == 'Download'
-                        });
-                        // Extract the speed
-                        return downloadLog.actions()[0].match(/(\S*\s\S+)(?=<br\/>)/)[0]
-                    } catch(err) { }
+                    var theSpeed = self.historyStatus.bytes()/self.historyStatus.download_time();
+                    theSpeed = theSpeed/1024;
+
+                    // MB/s or KB/s
+                    if(theSpeed > 1024) {
+                        theSpeed = theSpeed/1024;
+                        return theSpeed.toFixed(1) + ' MB/s'
+                    } else {
+                        return Math.round(theSpeed) + ' KB/s'
+                    }
                 }
                 return;
             case 'category':

interfaces/Glitter/templates/static/javascripts/glitter.main.js

@@ -12,7 +12,7 @@ function ViewModel() {
     self.isRestarting = ko.observable(false);
     self.useGlobalOptions = ko.observable(true).extend({ persist: 'useGlobalOptions' });
     self.refreshRate = ko.observable(1).extend({ persist: 'pageRefreshRate' });
-    self.dateFormat = ko.observable('fromNow').extend({ persist: 'pageDateFormat' });
+    self.dateFormat = ko.observable('DD/MM/YYYY HH:mm').extend({ persist: 'pageDateFormat' });
     self.displayTabbed = ko.observable().extend({ persist: 'displayTabbed' });
     self.displayCompact = ko.observable(false).extend({ persist: 'displayCompact' });
     self.confirmDeleteQueue = ko.observable(true).extend({ persist: 'confirmDeleteQueue' });
@@ -173,8 +173,8 @@ function ViewModel() {
         }
 
         // Did we exceed the space?
-        self.diskSpaceExceeded1(parseInt(response.queue.mbleft)/1024 > parseFloat(response.queue.diskspace1))
-        self.diskSpaceExceeded2(parseInt(response.queue.mbleft)/1024 > parseFloat(response.queue.diskspace2))
+        self.diskSpaceExceeded1(parseInt(response.queue.mbleft)/1024 > parseInt(response.queue.diskspace1))
+        self.diskSpaceExceeded2(parseInt(response.queue.mbleft)/1024 > parseInt(response.queue.diskspace2))
 
         // Quota
         self.quotaLimit(response.queue.quota)
@@ -331,13 +331,6 @@ function ViewModel() {
                 // Split title & speed
                 var dataSplit = data.split('|||');
 
-                // Maybe the result is actually the login page?
-                if(dataSplit[0].substring(0, 11) === '<html lang=') {
-                    // Redirect
-                    document.location = document.location
-                    return
-                }
-
                 // Set title
                 self.title(dataSplit[0]);
 
@@ -478,12 +471,6 @@ function ViewModel() {
             return;
         }
 
-        // Fix DateJS bug it has some strange problem with the current day-of-month + 1
-        // Removing the space makes DateJS work properly
-        newValue = newValue.replace(/\s*h|\s*m|\s*d/g, function(match) {
-            return match.trim()
-        });
-
         // Parse
         var pauseParsed = Date.parse(newValue);
 
@@ -545,7 +532,7 @@ function ViewModel() {
                 // Go over all warnings and add
                 $.each(response.warnings, function(index, warning) {
                     // Split warning into parts
-                    var warningSplit = convertHTMLtoText(warning).split(/\n/);
+                    var warningSplit = warning.split(/\n/);
 
                     // Reformat CSS label and date
                     var warningData = {
@@ -606,7 +593,7 @@ function ViewModel() {
     }
 
     // Shutdown options
-    self.setOnQueueFinish = function(model, event) {
+    self.onQueueFinish.subscribe(function(newValue) {
         // Ignore updates before the page is done
         if(!self.hasStatusInfo()) return;
 
@@ -614,12 +601,9 @@ function ViewModel() {
         callAPI({
             mode: 'queue',
             name: 'change_complete_action',
-            value: $(event.target).val()
+            value: newValue
         })
-
-        // Top stop blinking while the API is calling
-        self.onQueueFinish($(event.target).val())
-    }
+    })
 
     // Use global settings or device-specific?
     self.useGlobalOptions.subscribe(function(newValue) {

interfaces/Glitter/templates/static/javascripts/glitter.queue.js

@@ -148,6 +148,7 @@ function QueueListModel(parent) {
         // See what the actual index is of the queue-object
         // This way we can see how we move up and down independent of pagination
         var itemReplaced = self.queueItems()[event.targetIndex+corTerm];
+
         callAPI({
             mode: "switch",
             value: itemMoved.id,
@@ -155,25 +156,6 @@ function QueueListModel(parent) {
         }).then(self.parent.refresh);
     };
 
-    // Move button clicked
-    self.moveButton = function(event,ui) {
-        var itemMoved = event;
-        var targetIndex;
-        if($(ui.currentTarget).is(".buttonMoveToTop")){
-            //we want to move to the top
-            targetIndex = 0;
-        } else {
-            // we want to move to the bottom
-			targetIndex = self.totalItems() - 1;
-        }
-        callAPI({
-            mode: "switch",
-            value: itemMoved.id,
-            value2: targetIndex
-        }).then(self.parent.refresh);
-
-    }
-
     // Save pagination state
     self.paginationLimit.subscribe(function(newValue) {
         // Save in config if global
@@ -482,8 +464,7 @@ function QueueModel(parent, data) {
     self.totalMB = ko.observable(parseFloat(data.mb));
     self.remainingMB = ko.observable(parseFloat(data.mbleft));
     self.avg_age = ko.observable(data.avg_age)
-    self.missing = ko.observable(parseFloat(data.mbmissing))
-    self.direct_unpack = ko.observable(data.direct_unpack)
+    self.missing = ko.observable(data.missing)
     self.category = ko.observable(data.cat);
     self.priority = ko.observable(parent.priorityName[data.priority]);
     self.script = ko.observable(data.script);
@@ -495,6 +476,8 @@ function QueueModel(parent, data) {
     self.nameForEdit = ko.observable();
     self.editingName = ko.observable(false);
     self.hasDropdown = ko.observable(false);
+    self.rating_avg_video = ko.observable(false)
+    self.rating_avg_audio = ko.observable(false)
 
     // Color of the progress bar
     self.progressColor = ko.computed(function() {
@@ -502,8 +485,8 @@ function QueueModel(parent, data) {
         if(self.status() == 'Checking') {
             return '#58A9FA'
         }
-        // Check for missing data, the value is arbitrary! (3%)
-        if(self.missing()/self.totalMB() > 0.03) {
+        // Check for missing data, the value is arbitrary!
+        if(self.missing() > 50) {
             return '#F8A34E'
         }
         // Set to grey, only when not Force download
@@ -527,9 +510,9 @@ function QueueModel(parent, data) {
 
     // Texts
     self.missingText= ko.pureComputed(function() {
-        // Check for missing data, the value is arbitrary! (3%)
-        if(self.missing()/self.totalMB() > 0.03) {
-            return self.missing().toFixed(0) + ' MB ' + glitterTranslate.misingArt
+        // Check for missing data, the value is arbitrary!
+        if(self.missing() > 50) {
+            return self.missing() + ' ' + glitterTranslate.misingArt
         }
         return;
     })
@@ -582,14 +565,19 @@ function QueueModel(parent, data) {
         self.totalMB(parseFloat(data.mb));
         self.remainingMB(parseFloat(data.mbleft));
         self.avg_age(data.avg_age)
-        self.missing(parseFloat(data.mbmissing))
-        self.direct_unpack(data.direct_unpack)
+        self.missing(data.missing)
         self.category(data.cat);
         self.priority(parent.priorityName[data.priority]);
         self.script(data.script);
         self.unpackopts(parseInt(data.unpackopts)) // UnpackOpts fails if not parseInt'd!
         self.pausedStatus(data.status == 'Paused');
         self.timeLeft(data.timeleft);
+
+        // If exists, otherwise false
+        if(data.rating_avg_video !== undefined) {
+            self.rating_avg_video(data.rating_avg_video === 0 ? '-' : data.rating_avg_video);
+            self.rating_avg_audio(data.rating_avg_audio === 0 ? '-' : data.rating_avg_audio);
+        }
     };
 
     // Pause individual download

interfaces/Glitter/templates/static/javascripts/momentjs_locale/da.js

@@ -1,60 +1,59 @@
 //! moment.js locale configuration
-//! locale : Danish [da]
+//! locale : danish (da)
 //! author : Ulrik Nielsen : https://github.com/mrbase
 
-;(function (global, factory) {
-   typeof exports === 'object' && typeof module !== 'undefined'
-       && typeof require === 'function' ? factory(require('../moment')) :
-   typeof define === 'function' && define.amd ? define(['../moment'], factory) :
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
    factory(global.moment)
-}(this, (function (moment) { 'use strict';
+}(this, function (moment) { 'use strict';
 
 
-var da = moment.defineLocale('da', {
-    months : 'januar_februar_marts_april_maj_juni_juli_august_september_oktober_november_december'.split('_'),
-    monthsShort : 'jan_feb_mar_apr_maj_jun_jul_aug_sep_okt_nov_dec'.split('_'),
-    weekdays : 'søndag_mandag_tirsdag_onsdag_torsdag_fredag_lørdag'.split('_'),
-    weekdaysShort : 'søn_man_tir_ons_tor_fre_lør'.split('_'),
-    weekdaysMin : 'sø_ma_ti_on_to_fr_lø'.split('_'),
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'DD/MM/YYYY',
-        LL : 'D. MMMM YYYY',
-        LLL : 'D. MMMM YYYY HH:mm',
-        LLLL : 'dddd [d.] D. MMMM YYYY [kl.] HH:mm'
-    },
-    calendar : {
-        sameDay : '[i dag kl.] LT',
-        nextDay : '[i morgen kl.] LT',
-        nextWeek : 'på dddd [kl.] LT',
-        lastDay : '[i går kl.] LT',
-        lastWeek : '[i] dddd[s kl.] LT',
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : 'om %s',
-        past : '%s siden',
-        s : 'få sekunder',
-        m : 'et minut',
-        mm : '%d minutter',
-        h : 'en time',
-        hh : '%d timer',
-        d : 'en dag',
-        dd : '%d dage',
-        M : 'en måned',
-        MM : '%d måneder',
-        y : 'et år',
-        yy : '%d år'
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}\./,
-    ordinal : '%d.',
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 4  // The week that contains Jan 4th is the first week of the year.
-    }
-});
+    var da = moment.defineLocale('da', {
+        months : 'januar_februar_marts_april_maj_juni_juli_august_september_oktober_november_december'.split('_'),
+        monthsShort : 'jan_feb_mar_apr_maj_jun_jul_aug_sep_okt_nov_dec'.split('_'),
+        weekdays : 'søndag_mandag_tirsdag_onsdag_torsdag_fredag_lørdag'.split('_'),
+        weekdaysShort : 'søn_man_tir_ons_tor_fre_lør'.split('_'),
+        weekdaysMin : 'sø_ma_ti_on_to_fr_lø'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D. MMMM YYYY',
+            LLL : 'D. MMMM YYYY HH:mm',
+            LLLL : 'dddd [d.] D. MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay : '[I dag kl.] LT',
+            nextDay : '[I morgen kl.] LT',
+            nextWeek : 'dddd [kl.] LT',
+            lastDay : '[I går kl.] LT',
+            lastWeek : '[sidste] dddd [kl] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'om %s',
+            past : '%s siden',
+            s : 'få sekunder',
+            m : 'et minut',
+            mm : '%d minutter',
+            h : 'en time',
+            hh : '%d timer',
+            d : 'en dag',
+            dd : '%d dage',
+            M : 'en måned',
+            MM : '%d måneder',
+            y : 'et år',
+            yy : '%d år'
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-return da;
+    return da;
 
-})));
+}));

interfaces/Glitter/templates/static/javascripts/momentjs_locale/de.js

@@ -1,78 +1,74 @@
 //! moment.js locale configuration
-//! locale : German [de]
+//! locale : german (de)
 //! author : lluchs : https://github.com/lluchs
 //! author: Menelion Elensúle: https://github.com/Oire
-//! author : Mikolaj Dadela : https://github.com/mik01aj
 
-;(function (global, factory) {
-   typeof exports === 'object' && typeof module !== 'undefined'
-       && typeof require === 'function' ? factory(require('../moment')) :
-   typeof define === 'function' && define.amd ? define(['../moment'], factory) :
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
    factory(global.moment)
-}(this, (function (moment) { 'use strict';
+}(this, function (moment) { 'use strict';
 
 
-function processRelativeTime(number, withoutSuffix, key, isFuture) {
-    var format = {
-        'm': ['eine Minute', 'einer Minute'],
-        'h': ['eine Stunde', 'einer Stunde'],
-        'd': ['ein Tag', 'einem Tag'],
-        'dd': [number + ' Tage', number + ' Tagen'],
-        'M': ['ein Monat', 'einem Monat'],
-        'MM': [number + ' Monate', number + ' Monaten'],
-        'y': ['ein Jahr', 'einem Jahr'],
-        'yy': [number + ' Jahre', number + ' Jahren']
-    };
-    return withoutSuffix ? format[key][0] : format[key][1];
-}
-
-var de = moment.defineLocale('de', {
-    months : 'Januar_Februar_März_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember'.split('_'),
-    monthsShort : 'Jan._Febr._Mrz._Apr._Mai_Jun._Jul._Aug._Sept._Okt._Nov._Dez.'.split('_'),
-    monthsParseExact : true,
-    weekdays : 'Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag'.split('_'),
-    weekdaysShort : 'So._Mo._Di._Mi._Do._Fr._Sa.'.split('_'),
-    weekdaysMin : 'So_Mo_Di_Mi_Do_Fr_Sa'.split('_'),
-    weekdaysParseExact : true,
-    longDateFormat : {
-        LT: 'HH:mm',
-        LTS: 'HH:mm:ss',
-        L : 'DD.MM.YYYY',
-        LL : 'D. MMMM YYYY',
-        LLL : 'D. MMMM YYYY HH:mm',
-        LLLL : 'dddd, D. MMMM YYYY HH:mm'
-    },
-    calendar : {
-        sameDay: '[heute um] LT [Uhr]',
-        sameElse: 'L',
-        nextDay: '[morgen um] LT [Uhr]',
-        nextWeek: 'dddd [um] LT [Uhr]',
-        lastDay: '[gestern um] LT [Uhr]',
-        lastWeek: '[letzten] dddd [um] LT [Uhr]'
-    },
-    relativeTime : {
-        future : 'in %s',
-        past : 'vor %s',
-        s : 'ein paar Sekunden',
-        m : processRelativeTime,
-        mm : '%d Minuten',
-        h : processRelativeTime,
-        hh : '%d Stunden',
-        d : processRelativeTime,
-        dd : processRelativeTime,
-        M : processRelativeTime,
-        MM : processRelativeTime,
-        y : processRelativeTime,
-        yy : processRelativeTime
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}\./,
-    ordinal : '%d.',
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 4  // The week that contains Jan 4th is the first week of the year.
+    function processRelativeTime(number, withoutSuffix, key, isFuture) {
+        var format = {
+            'm': ['eine Minute', 'einer Minute'],
+            'h': ['eine Stunde', 'einer Stunde'],
+            'd': ['ein Tag', 'einem Tag'],
+            'dd': [number + ' Tage', number + ' Tagen'],
+            'M': ['ein Monat', 'einem Monat'],
+            'MM': [number + ' Monate', number + ' Monaten'],
+            'y': ['ein Jahr', 'einem Jahr'],
+            'yy': [number + ' Jahre', number + ' Jahren']
+        };
+        return withoutSuffix ? format[key][0] : format[key][1];
     }
-});
 
-return de;
+    var de = moment.defineLocale('de', {
+        months : 'Januar_Februar_März_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember'.split('_'),
+        monthsShort : 'Jan._Febr._Mrz._Apr._Mai_Jun._Jul._Aug._Sept._Okt._Nov._Dez.'.split('_'),
+        weekdays : 'Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag'.split('_'),
+        weekdaysShort : 'So._Mo._Di._Mi._Do._Fr._Sa.'.split('_'),
+        weekdaysMin : 'So_Mo_Di_Mi_Do_Fr_Sa'.split('_'),
+        longDateFormat : {
+            LT: 'HH:mm',
+            LTS: 'HH:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D. MMMM YYYY',
+            LLL : 'D. MMMM YYYY HH:mm',
+            LLLL : 'dddd, D. MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay: '[Heute um] LT [Uhr]',
+            sameElse: 'L',
+            nextDay: '[Morgen um] LT [Uhr]',
+            nextWeek: 'dddd [um] LT [Uhr]',
+            lastDay: '[Gestern um] LT [Uhr]',
+            lastWeek: '[letzten] dddd [um] LT [Uhr]'
+        },
+        relativeTime : {
+            future : 'in %s',
+            past : 'vor %s',
+            s : 'ein paar Sekunden',
+            m : processRelativeTime,
+            mm : '%d Minuten',
+            h : processRelativeTime,
+            hh : '%d Stunden',
+            d : processRelativeTime,
+            dd : processRelativeTime,
+            M : processRelativeTime,
+            MM : processRelativeTime,
+            y : processRelativeTime,
+            yy : processRelativeTime
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-})));
+    return de;
+
+}));

interfaces/Glitter/templates/static/javascripts/momentjs_locale/es.js

@@ -1,83 +1,78 @@
 //! moment.js locale configuration
-//! locale : Spanish [es]
+//! locale : spanish (es)
 //! author : Julio Napurí : https://github.com/julionc
 
-;(function (global, factory) {
-   typeof exports === 'object' && typeof module !== 'undefined'
-       && typeof require === 'function' ? factory(require('../moment')) :
-   typeof define === 'function' && define.amd ? define(['../moment'], factory) :
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
    factory(global.moment)
-}(this, (function (moment) { 'use strict';
+}(this, function (moment) { 'use strict';
 
 
-var monthsShortDot = 'ene._feb._mar._abr._may._jun._jul._ago._sep._oct._nov._dic.'.split('_');
-var monthsShort = 'ene_feb_mar_abr_may_jun_jul_ago_sep_oct_nov_dic'.split('_');
+    var monthsShortDot = 'Ene._Feb._Mar._Abr._May._Jun._Jul._Ago._Sep._Oct._Nov._Dic.'.split('_'),
+        monthsShort = 'Ene_Feb_Mar_Abr_May_Jun_Jul_Ago_Sep_Oct_Nov_Dic'.split('_');
 
-var es = moment.defineLocale('es', {
-    months : 'enero_febrero_marzo_abril_mayo_junio_julio_agosto_septiembre_octubre_noviembre_diciembre'.split('_'),
-    monthsShort : function (m, format) {
-        if (!m) {
-            return monthsShortDot;
-        } else if (/-MMM-/.test(format)) {
-            return monthsShort[m.month()];
-        } else {
-            return monthsShortDot[m.month()];
+    var es = moment.defineLocale('es', {
+        months : 'Enero_Febrero_Marzo_Abril_Mayo_Junio_Julio_Agosto_Septiembre_Octubre_Noviembre_Diciembre'.split('_'),
+        monthsShort : function (m, format) {
+            if (/-MMM-/.test(format)) {
+                return monthsShort[m.month()];
+            } else {
+                return monthsShortDot[m.month()];
+            }
+        },
+        weekdays : 'Domingo_Lunes_Martes_Miércoles_Jueves_Viernes_Sábado'.split('_'),
+        weekdaysShort : 'Dom._Lun._Mar._Mié._Jue._Vie._Sáb.'.split('_'),
+        weekdaysMin : 'Do_Lu_Ma_Mi_Ju_Vi_Sá'.split('_'),
+        longDateFormat : {
+            LT : 'H:mm',
+            LTS : 'H:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D [de] MMMM [de] YYYY',
+            LLL : 'D [de] MMMM [de] YYYY H:mm',
+            LLLL : 'dddd, D [de] MMMM [de] YYYY H:mm'
+        },
+        calendar : {
+            sameDay : function () {
+                return '[hoy a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+            },
+            nextDay : function () {
+                return '[mañana a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+            },
+            nextWeek : function () {
+                return 'dddd [a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+            },
+            lastDay : function () {
+                return '[ayer a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+            },
+            lastWeek : function () {
+                return '[el] dddd [pasado a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'en %s',
+            past : 'hace %s',
+            s : 'unos segundos',
+            m : 'un minuto',
+            mm : '%d minutos',
+            h : 'una hora',
+            hh : '%d horas',
+            d : 'un día',
+            dd : '%d días',
+            M : 'un mes',
+            MM : '%d meses',
+            y : 'un año',
+            yy : '%d años'
+        },
+        ordinalParse : /\d{1,2}º/,
+        ordinal : '%dº',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
         }
-    },
-    monthsParseExact : true,
-    weekdays : 'domingo_lunes_martes_miércoles_jueves_viernes_sábado'.split('_'),
-    weekdaysShort : 'dom._lun._mar._mié._jue._vie._sáb.'.split('_'),
-    weekdaysMin : 'do_lu_ma_mi_ju_vi_sá'.split('_'),
-    weekdaysParseExact : true,
-    longDateFormat : {
-        LT : 'H:mm',
-        LTS : 'H:mm:ss',
-        L : 'DD/MM/YYYY',
-        LL : 'D [de] MMMM [de] YYYY',
-        LLL : 'D [de] MMMM [de] YYYY H:mm',
-        LLLL : 'dddd, D [de] MMMM [de] YYYY H:mm'
-    },
-    calendar : {
-        sameDay : function () {
-            return '[hoy a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
-        },
-        nextDay : function () {
-            return '[mañana a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
-        },
-        nextWeek : function () {
-            return 'dddd [a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
-        },
-        lastDay : function () {
-            return '[ayer a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
-        },
-        lastWeek : function () {
-            return '[el] dddd [pasado a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
-        },
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : 'en %s',
-        past : 'hace %s',
-        s : 'unos segundos',
-        m : 'un minuto',
-        mm : '%d minutos',
-        h : 'una hora',
-        hh : '%d horas',
-        d : 'un día',
-        dd : '%d días',
-        M : 'un mes',
-        MM : '%d meses',
-        y : 'un año',
-        yy : '%d años'
-    },
-    dayOfMonthOrdinalParse : /\d{1,2}º/,
-    ordinal : '%dº',
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 4  // The week that contains Jan 4th is the first week of the year.
-    }
-});
+    });
 
-return es;
+    return es;
 
-})));
+}));

interfaces/Glitter/templates/static/javascripts/momentjs_locale/fi.js

@@ -1,23 +1,22 @@
 //! moment.js locale configuration
-//! locale : Finnish [fi]
+//! locale : finnish (fi)
 //! author : Tarmo Aidantausta : https://github.com/bleadof
 
-;(function (global, factory) {
-   typeof exports === 'object' && typeof module !== 'undefined'
-       && typeof require === 'function' ? factory(require('../moment')) :
-   typeof define === 'function' && define.amd ? define(['../moment'], factory) :
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
    factory(global.moment)
-}(this, (function (moment) { 'use strict';
+}(this, function (moment) { 'use strict';
 
 
-var numbersPast = 'nolla yksi kaksi kolme neljä viisi kuusi seitsemän kahdeksan yhdeksän'.split(' ');
-var numbersFuture = [
-        'nolla', 'yhden', 'kahden', 'kolmen', 'neljän', 'viiden', 'kuuden',
-        numbersPast[7], numbersPast[8], numbersPast[9]
-    ];
-function translate(number, withoutSuffix, key, isFuture) {
-    var result = '';
-    switch (key) {
+    var numbersPast = 'nolla yksi kaksi kolme neljä viisi kuusi seitsemän kahdeksan yhdeksän'.split(' '),
+        numbersFuture = [
+            'nolla', 'yhden', 'kahden', 'kolmen', 'neljän', 'viiden', 'kuuden',
+            numbersPast[7], numbersPast[8], numbersPast[9]
+        ];
+    function translate(number, withoutSuffix, key, isFuture) {
+        var result = '';
+        switch (key) {
         case 's':
             return isFuture ? 'muutaman sekunnin' : 'muutama sekunti';
         case 'm':
@@ -45,63 +44,63 @@ function translate(number, withoutSuffix, key, isFuture) {
         case 'yy':
             result = isFuture ? 'vuoden' : 'vuotta';
             break;
+        }
+        result = verbalNumber(number, isFuture) + ' ' + result;
+        return result;
     }
-    result = verbalNumber(number, isFuture) + ' ' + result;
-    return result;
-}
-function verbalNumber(number, isFuture) {
-    return number < 10 ? (isFuture ? numbersFuture[number] : numbersPast[number]) : number;
-}
-
-var fi = moment.defineLocale('fi', {
-    months : 'tammikuu_helmikuu_maaliskuu_huhtikuu_toukokuu_kesäkuu_heinäkuu_elokuu_syyskuu_lokakuu_marraskuu_joulukuu'.split('_'),
-    monthsShort : 'tammi_helmi_maalis_huhti_touko_kesä_heinä_elo_syys_loka_marras_joulu'.split('_'),
-    weekdays : 'sunnuntai_maanantai_tiistai_keskiviikko_torstai_perjantai_lauantai'.split('_'),
-    weekdaysShort : 'su_ma_ti_ke_to_pe_la'.split('_'),
-    weekdaysMin : 'su_ma_ti_ke_to_pe_la'.split('_'),
-    longDateFormat : {
-        LT : 'HH.mm',
-        LTS : 'HH.mm.ss',
-        L : 'DD.MM.YYYY',
-        LL : 'Do MMMM[ta] YYYY',
-        LLL : 'Do MMMM[ta] YYYY, [klo] HH.mm',
-        LLLL : 'dddd, Do MMMM[ta] YYYY, [klo] HH.mm',
-        l : 'D.M.YYYY',
-        ll : 'Do MMM YYYY',
-        lll : 'Do MMM YYYY, [klo] HH.mm',
-        llll : 'ddd, Do MMM YYYY, [klo] HH.mm'
-    },
-    calendar : {
-        sameDay : '[tänään] [klo] LT',
-        nextDay : '[huomenna] [klo] LT',
-        nextWeek : 'dddd [klo] LT',
-        lastDay : '[eilen] [klo] LT',
-        lastWeek : '[viime] dddd[na] [klo] LT',
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : '%s päästä',
-        past : '%s sitten',
-        s : translate,
-        m : translate,
-        mm : translate,
-        h : translate,
-        hh : translate,
-        d : translate,
-        dd : translate,
-        M : translate,
-        MM : translate,
-        y : translate,
-        yy : translate
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}\./,
-    ordinal : '%d.',
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 4  // The week that contains Jan 4th is the first week of the year.
+    function verbalNumber(number, isFuture) {
+        return number < 10 ? (isFuture ? numbersFuture[number] : numbersPast[number]) : number;
     }
-});
 
-return fi;
+    var fi = moment.defineLocale('fi', {
+        months : 'tammikuu_helmikuu_maaliskuu_huhtikuu_toukokuu_kesäkuu_heinäkuu_elokuu_syyskuu_lokakuu_marraskuu_joulukuu'.split('_'),
+        monthsShort : 'tammi_helmi_maalis_huhti_touko_kesä_heinä_elo_syys_loka_marras_joulu'.split('_'),
+        weekdays : 'sunnuntai_maanantai_tiistai_keskiviikko_torstai_perjantai_lauantai'.split('_'),
+        weekdaysShort : 'su_ma_ti_ke_to_pe_la'.split('_'),
+        weekdaysMin : 'su_ma_ti_ke_to_pe_la'.split('_'),
+        longDateFormat : {
+            LT : 'HH.mm',
+            LTS : 'HH.mm.ss',
+            L : 'DD.MM.YYYY',
+            LL : 'Do MMMM[ta] YYYY',
+            LLL : 'Do MMMM[ta] YYYY, [klo] HH.mm',
+            LLLL : 'dddd, Do MMMM[ta] YYYY, [klo] HH.mm',
+            l : 'D.M.YYYY',
+            ll : 'Do MMM YYYY',
+            lll : 'Do MMM YYYY, [klo] HH.mm',
+            llll : 'ddd, Do MMM YYYY, [klo] HH.mm'
+        },
+        calendar : {
+            sameDay : '[tänään] [klo] LT',
+            nextDay : '[huomenna] [klo] LT',
+            nextWeek : 'dddd [klo] LT',
+            lastDay : '[eilen] [klo] LT',
+            lastWeek : '[viime] dddd[na] [klo] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s päästä',
+            past : '%s sitten',
+            s : translate,
+            m : translate,
+            mm : translate,
+            h : translate,
+            hh : translate,
+            d : translate,
+            dd : translate,
+            M : translate,
+            MM : translate,
+            y : translate,
+            yy : translate
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-})));
+    return fi;
+
+}));

interfaces/Glitter/templates/static/javascripts/momentjs_locale/fr.js

@@ -1,83 +1,61 @@
 //! moment.js locale configuration
-//! locale : French [fr]
+//! locale : french (fr)
 //! author : John Fischer : https://github.com/jfroffice
 
-;(function (global, factory) {
-   typeof exports === 'object' && typeof module !== 'undefined'
-       && typeof require === 'function' ? factory(require('../moment')) :
-   typeof define === 'function' && define.amd ? define(['../moment'], factory) :
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
    factory(global.moment)
-}(this, (function (moment) { 'use strict';
+}(this, function (moment) { 'use strict';
 
 
-var fr = moment.defineLocale('fr', {
-    months : 'janvier_février_mars_avril_mai_juin_juillet_août_septembre_octobre_novembre_décembre'.split('_'),
-    monthsShort : 'janv._févr._mars_avr._mai_juin_juil._août_sept._oct._nov._déc.'.split('_'),
-    monthsParseExact : true,
-    weekdays : 'dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi'.split('_'),
-    weekdaysShort : 'dim._lun._mar._mer._jeu._ven._sam.'.split('_'),
-    weekdaysMin : 'Di_Lu_Ma_Me_Je_Ve_Sa'.split('_'),
-    weekdaysParseExact : true,
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'DD/MM/YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY HH:mm',
-        LLLL : 'dddd D MMMM YYYY HH:mm'
-    },
-    calendar : {
-        sameDay : '[Aujourd’hui à] LT',
-        nextDay : '[Demain à] LT',
-        nextWeek : 'dddd [à] LT',
-        lastDay : '[Hier à] LT',
-        lastWeek : 'dddd [dernier à] LT',
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : 'dans %s',
-        past : 'il y a %s',
-        s : 'quelques secondes',
-        m : 'une minute',
-        mm : '%d minutes',
-        h : 'une heure',
-        hh : '%d heures',
-        d : 'un jour',
-        dd : '%d jours',
-        M : 'un mois',
-        MM : '%d mois',
-        y : 'un an',
-        yy : '%d ans'
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}(er|)/,
-    ordinal : function (number, period) {
-        switch (period) {
-            // TODO: Return 'e' when day of month > 1. Move this case inside
-            // block for masculine words below.
-            // See https://github.com/moment/moment/issues/3375
-            case 'D':
-                return number + (number === 1 ? 'er' : '');
-
-            // Words with masculine grammatical gender: mois, trimestre, jour
-            default:
-            case 'M':
-            case 'Q':
-            case 'DDD':
-            case 'd':
-                return number + (number === 1 ? 'er' : 'e');
-
-            // Words with feminine grammatical gender: semaine
-            case 'w':
-            case 'W':
-                return number + (number === 1 ? 're' : 'e');
+    var fr = moment.defineLocale('fr', {
+        months : 'janvier_février_mars_avril_mai_juin_juillet_août_septembre_octobre_novembre_décembre'.split('_'),
+        monthsShort : 'janv._févr._mars_avr._mai_juin_juil._août_sept._oct._nov._déc.'.split('_'),
+        weekdays : 'dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi'.split('_'),
+        weekdaysShort : 'dim._lun._mar._mer._jeu._ven._sam.'.split('_'),
+        weekdaysMin : 'Di_Lu_Ma_Me_Je_Ve_Sa'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay: '[Aujourd\'hui à] LT',
+            nextDay: '[Demain à] LT',
+            nextWeek: 'dddd [à] LT',
+            lastDay: '[Hier à] LT',
+            lastWeek: 'dddd [dernier à] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'dans %s',
+            past : 'il y a %s',
+            s : 'quelques secondes',
+            m : 'une minute',
+            mm : '%d minutes',
+            h : 'une heure',
+            hh : '%d heures',
+            d : 'un jour',
+            dd : '%d jours',
+            M : 'un mois',
+            MM : '%d mois',
+            y : 'un an',
+            yy : '%d ans'
+        },
+        ordinalParse: /\d{1,2}(er|)/,
+        ordinal : function (number) {
+            return number + (number === 1 ? 'er' : '');
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
         }
-    },
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 4  // The week that contains Jan 4th is the first week of the year.
-    }
-});
+    });
 
-return fr;
+    return fr;
 
-})));
+}));

interfaces/Glitter/templates/static/javascripts/momentjs_locale/nb.js

@@ -1,63 +1,60 @@
 //! moment.js locale configuration
-//! locale : Norwegian Bokmål [nb]
+//! locale : norwegian bokmål (nb)
 //! authors : Espen Hovlandsdal : https://github.com/rexxars
 //!           Sigurd Gartmann : https://github.com/sigurdga
 
-;(function (global, factory) {
-   typeof exports === 'object' && typeof module !== 'undefined'
-       && typeof require === 'function' ? factory(require('../moment')) :
-   typeof define === 'function' && define.amd ? define(['../moment'], factory) :
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
    factory(global.moment)
-}(this, (function (moment) { 'use strict';
+}(this, function (moment) { 'use strict';
 
 
-var nb = moment.defineLocale('nb', {
-    months : 'januar_februar_mars_april_mai_juni_juli_august_september_oktober_november_desember'.split('_'),
-    monthsShort : 'jan._feb._mars_april_mai_juni_juli_aug._sep._okt._nov._des.'.split('_'),
-    monthsParseExact : true,
-    weekdays : 'søndag_mandag_tirsdag_onsdag_torsdag_fredag_lørdag'.split('_'),
-    weekdaysShort : 'sø._ma._ti._on._to._fr._lø.'.split('_'),
-    weekdaysMin : 'sø_ma_ti_on_to_fr_lø'.split('_'),
-    weekdaysParseExact : true,
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'DD.MM.YYYY',
-        LL : 'D. MMMM YYYY',
-        LLL : 'D. MMMM YYYY [kl.] HH:mm',
-        LLLL : 'dddd D. MMMM YYYY [kl.] HH:mm'
-    },
-    calendar : {
-        sameDay: '[i dag kl.] LT',
-        nextDay: '[i morgen kl.] LT',
-        nextWeek: 'dddd [kl.] LT',
-        lastDay: '[i går kl.] LT',
-        lastWeek: '[forrige] dddd [kl.] LT',
-        sameElse: 'L'
-    },
-    relativeTime : {
-        future : 'om %s',
-        past : '%s siden',
-        s : 'noen sekunder',
-        m : 'ett minutt',
-        mm : '%d minutter',
-        h : 'en time',
-        hh : '%d timer',
-        d : 'en dag',
-        dd : '%d dager',
-        M : 'en måned',
-        MM : '%d måneder',
-        y : 'ett år',
-        yy : '%d år'
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}\./,
-    ordinal : '%d.',
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 4  // The week that contains Jan 4th is the first week of the year.
-    }
-});
+    var nb = moment.defineLocale('nb', {
+        months : 'januar_februar_mars_april_mai_juni_juli_august_september_oktober_november_desember'.split('_'),
+        monthsShort : 'jan_feb_mar_apr_mai_jun_jul_aug_sep_okt_nov_des'.split('_'),
+        weekdays : 'søndag_mandag_tirsdag_onsdag_torsdag_fredag_lørdag'.split('_'),
+        weekdaysShort : 'søn_man_tirs_ons_tors_fre_lør'.split('_'),
+        weekdaysMin : 'sø_ma_ti_on_to_fr_lø'.split('_'),
+        longDateFormat : {
+            LT : 'H.mm',
+            LTS : 'H.mm.ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D. MMMM YYYY',
+            LLL : 'D. MMMM YYYY [kl.] H.mm',
+            LLLL : 'dddd D. MMMM YYYY [kl.] H.mm'
+        },
+        calendar : {
+            sameDay: '[i dag kl.] LT',
+            nextDay: '[i morgen kl.] LT',
+            nextWeek: 'dddd [kl.] LT',
+            lastDay: '[i går kl.] LT',
+            lastWeek: '[forrige] dddd [kl.] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'om %s',
+            past : 'for %s siden',
+            s : 'noen sekunder',
+            m : 'ett minutt',
+            mm : '%d minutter',
+            h : 'en time',
+            hh : '%d timer',
+            d : 'en dag',
+            dd : '%d dager',
+            M : 'en måned',
+            MM : '%d måneder',
+            y : 'ett år',
+            yy : '%d år'
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-return nb;
+    return nb;
 
-})));
+}));

interfaces/Glitter/templates/static/javascripts/momentjs_locale/nl.js

@@ -1,88 +1,70 @@
 //! moment.js locale configuration
-//! locale : Dutch [nl]
-//! author : Joris Röling : https://github.com/jorisroling
-//! author : Jacob Middag : https://github.com/middagj
+//! locale : dutch (nl)
+//! author : Joris Röling : https://github.com/jjupiter
 
-;(function (global, factory) {
-   typeof exports === 'object' && typeof module !== 'undefined'
-       && typeof require === 'function' ? factory(require('../moment')) :
-   typeof define === 'function' && define.amd ? define(['../moment'], factory) :
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
    factory(global.moment)
-}(this, (function (moment) { 'use strict';
+}(this, function (moment) { 'use strict';
 
 
-var monthsShortWithDots = 'jan._feb._mrt._apr._mei_jun._jul._aug._sep._okt._nov._dec.'.split('_');
-var monthsShortWithoutDots = 'jan_feb_mrt_apr_mei_jun_jul_aug_sep_okt_nov_dec'.split('_');
+    var monthsShortWithDots = 'jan._feb._mrt._apr._mei_jun._jul._aug._sep._okt._nov._dec.'.split('_'),
+        monthsShortWithoutDots = 'jan_feb_mrt_apr_mei_jun_jul_aug_sep_okt_nov_dec'.split('_');
 
-var monthsParse = [/^jan/i, /^feb/i, /^maart|mrt.?$/i, /^apr/i, /^mei$/i, /^jun[i.]?$/i, /^jul[i.]?$/i, /^aug/i, /^sep/i, /^okt/i, /^nov/i, /^dec/i];
-var monthsRegex = /^(januari|februari|maart|april|mei|april|ju[nl]i|augustus|september|oktober|november|december|jan\.?|feb\.?|mrt\.?|apr\.?|ju[nl]\.?|aug\.?|sep\.?|okt\.?|nov\.?|dec\.?)/i;
-
-var nl = moment.defineLocale('nl', {
-    months : 'januari_februari_maart_april_mei_juni_juli_augustus_september_oktober_november_december'.split('_'),
-    monthsShort : function (m, format) {
-        if (!m) {
-            return monthsShortWithDots;
-        } else if (/-MMM-/.test(format)) {
-            return monthsShortWithoutDots[m.month()];
-        } else {
-            return monthsShortWithDots[m.month()];
+    var nl = moment.defineLocale('nl', {
+        months : 'januari_februari_maart_april_mei_juni_juli_augustus_september_oktober_november_december'.split('_'),
+        monthsShort : function (m, format) {
+            if (/-MMM-/.test(format)) {
+                return monthsShortWithoutDots[m.month()];
+            } else {
+                return monthsShortWithDots[m.month()];
+            }
+        },
+        weekdays : 'zondag_maandag_dinsdag_woensdag_donderdag_vrijdag_zaterdag'.split('_'),
+        weekdaysShort : 'zo._ma._di._wo._do._vr._za.'.split('_'),
+        weekdaysMin : 'Zo_Ma_Di_Wo_Do_Vr_Za'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD-MM-YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay: '[vandaag om] LT',
+            nextDay: '[morgen om] LT',
+            nextWeek: 'dddd [om] LT',
+            lastDay: '[gisteren om] LT',
+            lastWeek: '[afgelopen] dddd [om] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'over %s',
+            past : '%s geleden',
+            s : 'een paar seconden',
+            m : 'één minuut',
+            mm : '%d minuten',
+            h : 'één uur',
+            hh : '%d uur',
+            d : 'één dag',
+            dd : '%d dagen',
+            M : 'één maand',
+            MM : '%d maanden',
+            y : 'één jaar',
+            yy : '%d jaar'
+        },
+        ordinalParse: /\d{1,2}(ste|de)/,
+        ordinal : function (number) {
+            return number + ((number === 1 || number === 8 || number >= 20) ? 'ste' : 'de');
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
         }
-    },
+    });
 
-    monthsRegex: monthsRegex,
-    monthsShortRegex: monthsRegex,
-    monthsStrictRegex: /^(januari|februari|maart|mei|ju[nl]i|april|augustus|september|oktober|november|december)/i,
-    monthsShortStrictRegex: /^(jan\.?|feb\.?|mrt\.?|apr\.?|mei|ju[nl]\.?|aug\.?|sep\.?|okt\.?|nov\.?|dec\.?)/i,
+    return nl;
 
-    monthsParse : monthsParse,
-    longMonthsParse : monthsParse,
-    shortMonthsParse : monthsParse,
-
-    weekdays : 'zondag_maandag_dinsdag_woensdag_donderdag_vrijdag_zaterdag'.split('_'),
-    weekdaysShort : 'zo._ma._di._wo._do._vr._za.'.split('_'),
-    weekdaysMin : 'Zo_Ma_Di_Wo_Do_Vr_Za'.split('_'),
-    weekdaysParseExact : true,
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'DD-MM-YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY HH:mm',
-        LLLL : 'dddd D MMMM YYYY HH:mm'
-    },
-    calendar : {
-        sameDay: '[vandaag om] LT',
-        nextDay: '[morgen om] LT',
-        nextWeek: 'dddd [om] LT',
-        lastDay: '[gisteren om] LT',
-        lastWeek: '[afgelopen] dddd [om] LT',
-        sameElse: 'L'
-    },
-    relativeTime : {
-        future : 'over %s',
-        past : '%s geleden',
-        s : 'een paar seconden',
-        m : 'één minuut',
-        mm : '%d minuten',
-        h : 'één uur',
-        hh : '%d uur',
-        d : 'één dag',
-        dd : '%d dagen',
-        M : 'één maand',
-        MM : '%d maanden',
-        y : 'één jaar',
-        yy : '%d jaar'
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}(ste|de)/,
-    ordinal : function (number) {
-        return number + ((number === 1 || number === 8 || number >= 20) ? 'ste' : 'de');
-    },
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 4  // The week that contains Jan 4th is the first week of the year.
-    }
-});
-
-return nl;
-
-})));
+}));

interfaces/Glitter/templates/static/javascripts/momentjs_locale/pl.js

@@ -1,23 +1,22 @@
 //! moment.js locale configuration
-//! locale : Polish [pl]
+//! locale : polish (pl)
 //! author : Rafal Hirsz : https://github.com/evoL
 
-;(function (global, factory) {
-   typeof exports === 'object' && typeof module !== 'undefined'
-       && typeof require === 'function' ? factory(require('../moment')) :
-   typeof define === 'function' && define.amd ? define(['../moment'], factory) :
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
    factory(global.moment)
-}(this, (function (moment) { 'use strict';
+}(this, function (moment) { 'use strict';
 
 
-var monthsNominative = 'styczeń_luty_marzec_kwiecień_maj_czerwiec_lipiec_sierpień_wrzesień_październik_listopad_grudzień'.split('_');
-var monthsSubjective = 'stycznia_lutego_marca_kwietnia_maja_czerwca_lipca_sierpnia_września_października_listopada_grudnia'.split('_');
-function plural(n) {
-    return (n % 10 < 5) && (n % 10 > 1) && ((~~(n / 10) % 10) !== 1);
-}
-function translate(number, withoutSuffix, key) {
-    var result = number + ' ';
-    switch (key) {
+    var monthsNominative = 'styczeń_luty_marzec_kwiecień_maj_czerwiec_lipiec_sierpień_wrzesień_październik_listopad_grudzień'.split('_'),
+        monthsSubjective = 'stycznia_lutego_marca_kwietnia_maja_czerwca_lipca_sierpnia_września_października_listopada_grudnia'.split('_');
+    function plural(n) {
+        return (n % 10 < 5) && (n % 10 > 1) && ((~~(n / 10) % 10) !== 1);
+    }
+    function translate(number, withoutSuffix, key) {
+        var result = number + ' ';
+        switch (key) {
         case 'm':
             return withoutSuffix ? 'minuta' : 'minutę';
         case 'mm':
@@ -30,43 +29,41 @@ function translate(number, withoutSuffix, key) {
             return result + (plural(number) ? 'miesiące' : 'miesięcy');
         case 'yy':
             return result + (plural(number) ? 'lata' : 'lat');
-    }
-}
-
-var pl = moment.defineLocale('pl', {
-    months : function (momentToFormat, format) {
-        if (!momentToFormat) {
-            return monthsNominative;
-        } else if (format === '') {
-            // Hack: if format empty we know this is used to generate
-            // RegExp by moment. Give then back both valid forms of months
-            // in RegExp ready format.
-            return '(' + monthsSubjective[momentToFormat.month()] + '|' + monthsNominative[momentToFormat.month()] + ')';
-        } else if (/D MMMM/.test(format)) {
-            return monthsSubjective[momentToFormat.month()];
-        } else {
-            return monthsNominative[momentToFormat.month()];
         }
-    },
-    monthsShort : 'sty_lut_mar_kwi_maj_cze_lip_sie_wrz_paź_lis_gru'.split('_'),
-    weekdays : 'niedziela_poniedziałek_wtorek_środa_czwartek_piątek_sobota'.split('_'),
-    weekdaysShort : 'ndz_pon_wt_śr_czw_pt_sob'.split('_'),
-    weekdaysMin : 'Nd_Pn_Wt_Śr_Cz_Pt_So'.split('_'),
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'DD.MM.YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY HH:mm',
-        LLLL : 'dddd, D MMMM YYYY HH:mm'
-    },
-    calendar : {
-        sameDay: '[Dziś o] LT',
-        nextDay: '[Jutro o] LT',
-        nextWeek: '[W] dddd [o] LT',
-        lastDay: '[Wczoraj o] LT',
-        lastWeek: function () {
-            switch (this.day()) {
+    }
+
+    var pl = moment.defineLocale('pl', {
+        months : function (momentToFormat, format) {
+            if (format === '') {
+                // Hack: if format empty we know this is used to generate
+                // RegExp by moment. Give then back both valid forms of months
+                // in RegExp ready format.
+                return '(' + monthsSubjective[momentToFormat.month()] + '|' + monthsNominative[momentToFormat.month()] + ')';
+            } else if (/D MMMM/.test(format)) {
+                return monthsSubjective[momentToFormat.month()];
+            } else {
+                return monthsNominative[momentToFormat.month()];
+            }
+        },
+        monthsShort : 'sty_lut_mar_kwi_maj_cze_lip_sie_wrz_paź_lis_gru'.split('_'),
+        weekdays : 'niedziela_poniedziałek_wtorek_środa_czwartek_piątek_sobota'.split('_'),
+        weekdaysShort : 'nie_pon_wt_śr_czw_pt_sb'.split('_'),
+        weekdaysMin : 'N_Pn_Wt_Śr_Cz_Pt_So'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd, D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay: '[Dziś o] LT',
+            nextDay: '[Jutro o] LT',
+            nextWeek: '[W] dddd [o] LT',
+            lastDay: '[Wczoraj o] LT',
+            lastWeek: function () {
+                switch (this.day()) {
                 case 0:
                     return '[W zeszłą niedzielę o] LT';
                 case 3:
@@ -75,33 +72,33 @@ var pl = moment.defineLocale('pl', {
                     return '[W zeszłą sobotę o] LT';
                 default:
                     return '[W zeszły] dddd [o] LT';
-            }
+                }
+            },
+            sameElse: 'L'
         },
-        sameElse: 'L'
-    },
-    relativeTime : {
-        future : 'za %s',
-        past : '%s temu',
-        s : 'kilka sekund',
-        m : translate,
-        mm : translate,
-        h : translate,
-        hh : translate,
-        d : '1 dzień',
-        dd : '%d dni',
-        M : 'miesiąc',
-        MM : translate,
-        y : 'rok',
-        yy : translate
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}\./,
-    ordinal : '%d.',
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 4  // The week that contains Jan 4th is the first week of the year.
-    }
-});
+        relativeTime : {
+            future : 'za %s',
+            past : '%s temu',
+            s : 'kilka sekund',
+            m : translate,
+            mm : translate,
+            h : translate,
+            hh : translate,
+            d : '1 dzień',
+            dd : '%d dni',
+            M : 'miesiąc',
+            MM : translate,
+            y : 'rok',
+            yy : translate
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-return pl;
+    return pl;
 
-})));
+}));

interfaces/Glitter/templates/static/javascripts/momentjs_locale/pt-br.js

@@ -1,61 +1,59 @@
 //! moment.js locale configuration
-//! locale : Portuguese (Brazil) [pt-br]
+//! locale : brazilian portuguese (pt-br)
 //! author : Caio Ribeiro Pereira : https://github.com/caio-ribeiro-pereira
 
-;(function (global, factory) {
-   typeof exports === 'object' && typeof module !== 'undefined'
-       && typeof require === 'function' ? factory(require('../moment')) :
-   typeof define === 'function' && define.amd ? define(['../moment'], factory) :
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
    factory(global.moment)
-}(this, (function (moment) { 'use strict';
+}(this, function (moment) { 'use strict';
 
 
-var ptBr = moment.defineLocale('pt-br', {
-    months : 'Janeiro_Fevereiro_Março_Abril_Maio_Junho_Julho_Agosto_Setembro_Outubro_Novembro_Dezembro'.split('_'),
-    monthsShort : 'Jan_Fev_Mar_Abr_Mai_Jun_Jul_Ago_Set_Out_Nov_Dez'.split('_'),
-    weekdays : 'Domingo_Segunda-feira_Terça-feira_Quarta-feira_Quinta-feira_Sexta-feira_Sábado'.split('_'),
-    weekdaysShort : 'Dom_Seg_Ter_Qua_Qui_Sex_Sáb'.split('_'),
-    weekdaysMin : 'Do_2ª_3ª_4ª_5ª_6ª_Sá'.split('_'),
-    weekdaysParseExact : true,
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'DD/MM/YYYY',
-        LL : 'D [de] MMMM [de] YYYY',
-        LLL : 'D [de] MMMM [de] YYYY [às] HH:mm',
-        LLLL : 'dddd, D [de] MMMM [de] YYYY [às] HH:mm'
-    },
-    calendar : {
-        sameDay: '[Hoje às] LT',
-        nextDay: '[Amanhã às] LT',
-        nextWeek: 'dddd [às] LT',
-        lastDay: '[Ontem às] LT',
-        lastWeek: function () {
-            return (this.day() === 0 || this.day() === 6) ?
-                '[Último] dddd [às] LT' : // Saturday + Sunday
-                '[Última] dddd [às] LT'; // Monday - Friday
+    var pt_br = moment.defineLocale('pt-br', {
+        months : 'Janeiro_Fevereiro_Março_Abril_Maio_Junho_Julho_Agosto_Setembro_Outubro_Novembro_Dezembro'.split('_'),
+        monthsShort : 'Jan_Fev_Mar_Abr_Mai_Jun_Jul_Ago_Set_Out_Nov_Dez'.split('_'),
+        weekdays : 'Domingo_Segunda-Feira_Terça-Feira_Quarta-Feira_Quinta-Feira_Sexta-Feira_Sábado'.split('_'),
+        weekdaysShort : 'Dom_Seg_Ter_Qua_Qui_Sex_Sáb'.split('_'),
+        weekdaysMin : 'Dom_2ª_3ª_4ª_5ª_6ª_Sáb'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D [de] MMMM [de] YYYY',
+            LLL : 'D [de] MMMM [de] YYYY [às] HH:mm',
+            LLLL : 'dddd, D [de] MMMM [de] YYYY [às] HH:mm'
         },
-        sameElse: 'L'
-    },
-    relativeTime : {
-        future : 'em %s',
-        past : '%s atrás',
-        s : 'poucos segundos',
-        m : 'um minuto',
-        mm : '%d minutos',
-        h : 'uma hora',
-        hh : '%d horas',
-        d : 'um dia',
-        dd : '%d dias',
-        M : 'um mês',
-        MM : '%d meses',
-        y : 'um ano',
-        yy : '%d anos'
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}º/,
-    ordinal : '%dº'
-});
+        calendar : {
+            sameDay: '[Hoje às] LT',
+            nextDay: '[Amanhã às] LT',
+            nextWeek: 'dddd [às] LT',
+            lastDay: '[Ontem às] LT',
+            lastWeek: function () {
+                return (this.day() === 0 || this.day() === 6) ?
+                    '[Último] dddd [às] LT' : // Saturday + Sunday
+                    '[Última] dddd [às] LT'; // Monday - Friday
+            },
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'em %s',
+            past : '%s atrás',
+            s : 'poucos segundos',
+            m : 'um minuto',
+            mm : '%d minutos',
+            h : 'uma hora',
+            hh : '%d horas',
+            d : 'um dia',
+            dd : '%d dias',
+            M : 'um mês',
+            MM : '%d meses',
+            y : 'um ano',
+            yy : '%d anos'
+        },
+        ordinalParse: /\d{1,2}º/,
+        ordinal : '%dº'
+    });
 
-return ptBr;
+    return pt_br;
 
-})));
+}));

interfaces/Glitter/templates/static/javascripts/momentjs_locale/ro.js

@@ -1,75 +1,73 @@
 //! moment.js locale configuration
-//! locale : Romanian [ro]
+//! locale : romanian (ro)
 //! author : Vlad Gurdiga : https://github.com/gurdiga
 //! author : Valentin Agachi : https://github.com/avaly
 
-;(function (global, factory) {
-   typeof exports === 'object' && typeof module !== 'undefined'
-       && typeof require === 'function' ? factory(require('../moment')) :
-   typeof define === 'function' && define.amd ? define(['../moment'], factory) :
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
    factory(global.moment)
-}(this, (function (moment) { 'use strict';
+}(this, function (moment) { 'use strict';
 
 
-function relativeTimeWithPlural(number, withoutSuffix, key) {
-    var format = {
-            'mm': 'minute',
-            'hh': 'ore',
-            'dd': 'zile',
-            'MM': 'luni',
-            'yy': 'ani'
+    function relativeTimeWithPlural(number, withoutSuffix, key) {
+        var format = {
+                'mm': 'minute',
+                'hh': 'ore',
+                'dd': 'zile',
+                'MM': 'luni',
+                'yy': 'ani'
+            },
+            separator = ' ';
+        if (number % 100 >= 20 || (number >= 100 && number % 100 === 0)) {
+            separator = ' de ';
+        }
+        return number + separator + format[key];
+    }
+
+    var ro = moment.defineLocale('ro', {
+        months : 'ianuarie_februarie_martie_aprilie_mai_iunie_iulie_august_septembrie_octombrie_noiembrie_decembrie'.split('_'),
+        monthsShort : 'ian._febr._mart._apr._mai_iun._iul._aug._sept._oct._nov._dec.'.split('_'),
+        weekdays : 'duminică_luni_marți_miercuri_joi_vineri_sâmbătă'.split('_'),
+        weekdaysShort : 'Dum_Lun_Mar_Mie_Joi_Vin_Sâm'.split('_'),
+        weekdaysMin : 'Du_Lu_Ma_Mi_Jo_Vi_Sâ'.split('_'),
+        longDateFormat : {
+            LT : 'H:mm',
+            LTS : 'H:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY H:mm',
+            LLLL : 'dddd, D MMMM YYYY H:mm'
         },
-        separator = ' ';
-    if (number % 100 >= 20 || (number >= 100 && number % 100 === 0)) {
-        separator = ' de ';
-    }
-    return number + separator + format[key];
-}
+        calendar : {
+            sameDay: '[azi la] LT',
+            nextDay: '[mâine la] LT',
+            nextWeek: 'dddd [la] LT',
+            lastDay: '[ieri la] LT',
+            lastWeek: '[fosta] dddd [la] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'peste %s',
+            past : '%s în urmă',
+            s : 'câteva secunde',
+            m : 'un minut',
+            mm : relativeTimeWithPlural,
+            h : 'o oră',
+            hh : relativeTimeWithPlural,
+            d : 'o zi',
+            dd : relativeTimeWithPlural,
+            M : 'o lună',
+            MM : relativeTimeWithPlural,
+            y : 'un an',
+            yy : relativeTimeWithPlural
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
 
-var ro = moment.defineLocale('ro', {
-    months : 'ianuarie_februarie_martie_aprilie_mai_iunie_iulie_august_septembrie_octombrie_noiembrie_decembrie'.split('_'),
-    monthsShort : 'ian._febr._mart._apr._mai_iun._iul._aug._sept._oct._nov._dec.'.split('_'),
-    monthsParseExact: true,
-    weekdays : 'duminică_luni_marți_miercuri_joi_vineri_sâmbătă'.split('_'),
-    weekdaysShort : 'Dum_Lun_Mar_Mie_Joi_Vin_Sâm'.split('_'),
-    weekdaysMin : 'Du_Lu_Ma_Mi_Jo_Vi_Sâ'.split('_'),
-    longDateFormat : {
-        LT : 'H:mm',
-        LTS : 'H:mm:ss',
-        L : 'DD.MM.YYYY',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY H:mm',
-        LLLL : 'dddd, D MMMM YYYY H:mm'
-    },
-    calendar : {
-        sameDay: '[azi la] LT',
-        nextDay: '[mâine la] LT',
-        nextWeek: 'dddd [la] LT',
-        lastDay: '[ieri la] LT',
-        lastWeek: '[fosta] dddd [la] LT',
-        sameElse: 'L'
-    },
-    relativeTime : {
-        future : 'peste %s',
-        past : '%s în urmă',
-        s : 'câteva secunde',
-        m : 'un minut',
-        mm : relativeTimeWithPlural,
-        h : 'o oră',
-        hh : relativeTimeWithPlural,
-        d : 'o zi',
-        dd : relativeTimeWithPlural,
-        M : 'o lună',
-        MM : relativeTimeWithPlural,
-        y : 'un an',
-        yy : relativeTimeWithPlural
-    },
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 7  // The week that contains Jan 1st is the first week of the year.
-    }
-});
+    return ro;
 
-return ro;
-
-})));
+}));

interfaces/Glitter/templates/static/javascripts/momentjs_locale/ru.js

@@ -1,110 +1,90 @@
 //! moment.js locale configuration
-//! locale : Russian [ru]
+//! locale : russian (ru)
 //! author : Viktorminator : https://github.com/Viktorminator
 //! Author : Menelion Elensúle : https://github.com/Oire
-//! author : Коренберг Марк : https://github.com/socketpair
 
-;(function (global, factory) {
-   typeof exports === 'object' && typeof module !== 'undefined'
-       && typeof require === 'function' ? factory(require('../moment')) :
-   typeof define === 'function' && define.amd ? define(['../moment'], factory) :
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
    factory(global.moment)
-}(this, (function (moment) { 'use strict';
+}(this, function (moment) { 'use strict';
 
 
-function plural(word, num) {
-    var forms = word.split('_');
-    return num % 10 === 1 && num % 100 !== 11 ? forms[0] : (num % 10 >= 2 && num % 10 <= 4 && (num % 100 < 10 || num % 100 >= 20) ? forms[1] : forms[2]);
-}
-function relativeTimeWithPlural(number, withoutSuffix, key) {
-    var format = {
-        'mm': withoutSuffix ? 'минута_минуты_минут' : 'минуту_минуты_минут',
-        'hh': 'час_часа_часов',
-        'dd': 'день_дня_дней',
-        'MM': 'месяц_месяца_месяцев',
-        'yy': 'год_года_лет'
-    };
-    if (key === 'm') {
-        return withoutSuffix ? 'минута' : 'минуту';
+    function plural(word, num) {
+        var forms = word.split('_');
+        return num % 10 === 1 && num % 100 !== 11 ? forms[0] : (num % 10 >= 2 && num % 10 <= 4 && (num % 100 < 10 || num % 100 >= 20) ? forms[1] : forms[2]);
     }
-    else {
-        return number + ' ' + plural(format[key], +number);
+    function relativeTimeWithPlural(number, withoutSuffix, key) {
+        var format = {
+            'mm': withoutSuffix ? 'минута_минуты_минут' : 'минуту_минуты_минут',
+            'hh': 'час_часа_часов',
+            'dd': 'день_дня_дней',
+            'MM': 'месяц_месяца_месяцев',
+            'yy': 'год_года_лет'
+        };
+        if (key === 'm') {
+            return withoutSuffix ? 'минута' : 'минуту';
+        }
+        else {
+            return number + ' ' + plural(format[key], +number);
+        }
     }
-}
-var monthsParse = [/^янв/i, /^фев/i, /^мар/i, /^апр/i, /^ма[йя]/i, /^июн/i, /^июл/i, /^авг/i, /^сен/i, /^окт/i, /^ноя/i, /^дек/i];
-
-// http://new.gramota.ru/spravka/rules/139-prop : § 103
-// Сокращения месяцев: http://new.gramota.ru/spravka/buro/search-answer?s=242637
-// CLDR data:          http://www.unicode.org/cldr/charts/28/summary/ru.html#1753
-var ru = moment.defineLocale('ru', {
-    months : {
-        format: 'января_февраля_марта_апреля_мая_июня_июля_августа_сентября_октября_ноября_декабря'.split('_'),
-        standalone: 'январь_февраль_март_апрель_май_июнь_июль_август_сентябрь_октябрь_ноябрь_декабрь'.split('_')
-    },
-    monthsShort : {
-        // по CLDR именно "июл." и "июн.", но какой смысл менять букву на точку ?
-        format: 'янв._февр._мар._апр._мая_июня_июля_авг._сент._окт._нояб._дек.'.split('_'),
-        standalone: 'янв._февр._март_апр._май_июнь_июль_авг._сент._окт._нояб._дек.'.split('_')
-    },
-    weekdays : {
-        standalone: 'воскресенье_понедельник_вторник_среда_четверг_пятница_суббота'.split('_'),
-        format: 'воскресенье_понедельник_вторник_среду_четверг_пятницу_субботу'.split('_'),
-        isFormat: /\[ ?[Вв] ?(?:прошлую|следующую|эту)? ?\] ?dddd/
-    },
-    weekdaysShort : 'вс_пн_вт_ср_чт_пт_сб'.split('_'),
-    weekdaysMin : 'вс_пн_вт_ср_чт_пт_сб'.split('_'),
-    monthsParse : monthsParse,
-    longMonthsParse : monthsParse,
-    shortMonthsParse : monthsParse,
-
-    // полные названия с падежами, по три буквы, для некоторых, по 4 буквы, сокращения с точкой и без точки
-    monthsRegex: /^(январ[ья]|янв\.?|феврал[ья]|февр?\.?|марта?|мар\.?|апрел[ья]|апр\.?|ма[йя]|июн[ья]|июн\.?|июл[ья]|июл\.?|августа?|авг\.?|сентябр[ья]|сент?\.?|октябр[ья]|окт\.?|ноябр[ья]|нояб?\.?|декабр[ья]|дек\.?)/i,
-
-    // копия предыдущего
-    monthsShortRegex: /^(январ[ья]|янв\.?|феврал[ья]|февр?\.?|марта?|мар\.?|апрел[ья]|апр\.?|ма[йя]|июн[ья]|июн\.?|июл[ья]|июл\.?|августа?|авг\.?|сентябр[ья]|сент?\.?|октябр[ья]|окт\.?|ноябр[ья]|нояб?\.?|декабр[ья]|дек\.?)/i,
-
-    // полные названия с падежами
-    monthsStrictRegex: /^(январ[яь]|феврал[яь]|марта?|апрел[яь]|ма[яй]|июн[яь]|июл[яь]|августа?|сентябр[яь]|октябр[яь]|ноябр[яь]|декабр[яь])/i,
-
-    // Выражение, которое соотвествует только сокращённым формам
-    monthsShortStrictRegex: /^(янв\.|февр?\.|мар[т.]|апр\.|ма[яй]|июн[ья.]|июл[ья.]|авг\.|сент?\.|окт\.|нояб?\.|дек\.)/i,
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'DD.MM.YYYY',
-        LL : 'D MMMM YYYY г.',
-        LLL : 'D MMMM YYYY г., HH:mm',
-        LLLL : 'dddd, D MMMM YYYY г., HH:mm'
-    },
-    calendar : {
-        sameDay: '[Сегодня в] LT',
-        nextDay: '[Завтра в] LT',
-        lastDay: '[Вчера в] LT',
-        nextWeek: function (now) {
-            if (now.week() !== this.week()) {
-                switch (this.day()) {
-                    case 0:
-                        return '[В следующее] dddd [в] LT';
-                    case 1:
-                    case 2:
-                    case 4:
-                        return '[В следующий] dddd [в] LT';
-                    case 3:
-                    case 5:
-                    case 6:
-                        return '[В следующую] dddd [в] LT';
-                }
-            } else {
-                if (this.day() === 2) {
-                    return '[Во] dddd [в] LT';
-                } else {
-                    return '[В] dddd [в] LT';
-                }
-            }
+    function monthsCaseReplace(m, format) {
+        var months = {
+            'nominative': 'январь_февраль_март_апрель_май_июнь_июль_август_сентябрь_октябрь_ноябрь_декабрь'.split('_'),
+            'accusative': 'января_февраля_марта_апреля_мая_июня_июля_августа_сентября_октября_ноября_декабря'.split('_')
         },
-        lastWeek: function (now) {
-            if (now.week() !== this.week()) {
-                switch (this.day()) {
+        nounCase = (/D[oD]?(\[[^\[\]]*\]|\s+)+MMMM?/).test(format) ?
+            'accusative' :
+            'nominative';
+        return months[nounCase][m.month()];
+    }
+    function monthsShortCaseReplace(m, format) {
+        var monthsShort = {
+            'nominative': 'янв_фев_март_апр_май_июнь_июль_авг_сен_окт_ноя_дек'.split('_'),
+            'accusative': 'янв_фев_мар_апр_мая_июня_июля_авг_сен_окт_ноя_дек'.split('_')
+        },
+        nounCase = (/D[oD]?(\[[^\[\]]*\]|\s+)+MMMM?/).test(format) ?
+            'accusative' :
+            'nominative';
+        return monthsShort[nounCase][m.month()];
+    }
+    function weekdaysCaseReplace(m, format) {
+        var weekdays = {
+            'nominative': 'воскресенье_понедельник_вторник_среда_четверг_пятница_суббота'.split('_'),
+            'accusative': 'воскресенье_понедельник_вторник_среду_четверг_пятницу_субботу'.split('_')
+        },
+        nounCase = (/\[ ?[Вв] ?(?:прошлую|следующую|эту)? ?\] ?dddd/).test(format) ?
+            'accusative' :
+            'nominative';
+        return weekdays[nounCase][m.day()];
+    }
+
+    var ru = moment.defineLocale('ru', {
+        months : monthsCaseReplace,
+        monthsShort : monthsShortCaseReplace,
+        weekdays : weekdaysCaseReplace,
+        weekdaysShort : 'вс_пн_вт_ср_чт_пт_сб'.split('_'),
+        weekdaysMin : 'вс_пн_вт_ср_чт_пт_сб'.split('_'),
+        monthsParse : [/^янв/i, /^фев/i, /^мар/i, /^апр/i, /^ма[й|я]/i, /^июн/i, /^июл/i, /^авг/i, /^сен/i, /^окт/i, /^ноя/i, /^дек/i],
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D MMMM YYYY г.',
+            LLL : 'D MMMM YYYY г., HH:mm',
+            LLLL : 'dddd, D MMMM YYYY г., HH:mm'
+        },
+        calendar : {
+            sameDay: '[Сегодня в] LT',
+            nextDay: '[Завтра в] LT',
+            lastDay: '[Вчера в] LT',
+            nextWeek: function () {
+                return this.day() === 2 ? '[Во] dddd [в] LT' : '[В] dddd [в] LT';
+            },
+            lastWeek: function (now) {
+                if (now.week() !== this.week()) {
+                    switch (this.day()) {
                     case 0:
                         return '[В прошлое] dddd [в] LT';
                     case 1:
@@ -115,50 +95,50 @@ var ru = moment.defineLocale('ru', {
                     case 5:
                     case 6:
                         return '[В прошлую] dddd [в] LT';
-                }
-            } else {
-                if (this.day() === 2) {
-                    return '[Во] dddd [в] LT';
+                    }
                 } else {
-                    return '[В] dddd [в] LT';
+                    if (this.day() === 2) {
+                        return '[Во] dddd [в] LT';
+                    } else {
+                        return '[В] dddd [в] LT';
+                    }
                 }
+            },
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'через %s',
+            past : '%s назад',
+            s : 'несколько секунд',
+            m : relativeTimeWithPlural,
+            mm : relativeTimeWithPlural,
+            h : 'час',
+            hh : relativeTimeWithPlural,
+            d : 'день',
+            dd : relativeTimeWithPlural,
+            M : 'месяц',
+            MM : relativeTimeWithPlural,
+            y : 'год',
+            yy : relativeTimeWithPlural
+        },
+        meridiemParse: /ночи|утра|дня|вечера/i,
+        isPM : function (input) {
+            return /^(дня|вечера)$/.test(input);
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 4) {
+                return 'ночи';
+            } else if (hour < 12) {
+                return 'утра';
+            } else if (hour < 17) {
+                return 'дня';
+            } else {
+                return 'вечера';
             }
         },
-        sameElse: 'L'
-    },
-    relativeTime : {
-        future : 'через %s',
-        past : '%s назад',
-        s : 'несколько секунд',
-        m : relativeTimeWithPlural,
-        mm : relativeTimeWithPlural,
-        h : 'час',
-        hh : relativeTimeWithPlural,
-        d : 'день',
-        dd : relativeTimeWithPlural,
-        M : 'месяц',
-        MM : relativeTimeWithPlural,
-        y : 'год',
-        yy : relativeTimeWithPlural
-    },
-    meridiemParse: /ночи|утра|дня|вечера/i,
-    isPM : function (input) {
-        return /^(дня|вечера)$/.test(input);
-    },
-    meridiem : function (hour, minute, isLower) {
-        if (hour < 4) {
-            return 'ночи';
-        } else if (hour < 12) {
-            return 'утра';
-        } else if (hour < 17) {
-            return 'дня';
-        } else {
-            return 'вечера';
-        }
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}-(й|го|я)/,
-    ordinal: function (number, period) {
-        switch (period) {
+        ordinalParse: /\d{1,2}-(й|го|я)/,
+        ordinal: function (number, period) {
+            switch (period) {
             case 'M':
             case 'd':
             case 'DDD':
@@ -170,14 +150,14 @@ var ru = moment.defineLocale('ru', {
                 return number + '-я';
             default:
                 return number;
+            }
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
         }
-    },
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 7  // The week that contains Jan 1st is the first week of the year.
-    }
-});
+    });
 
-return ru;
+    return ru;
 
-})));
+}));

interfaces/Glitter/templates/static/javascripts/momentjs_locale/sr.js

@@ -1,110 +1,107 @@
 //! moment.js locale configuration
-//! locale : Serbian [sr]
+//! locale : Serbian-cyrillic (sr-cyrl)
 //! author : Milan Janačković<milanjanackovic@gmail.com> : https://github.com/milan-j
 
-;(function (global, factory) {
-   typeof exports === 'object' && typeof module !== 'undefined'
-       && typeof require === 'function' ? factory(require('../moment')) :
-   typeof define === 'function' && define.amd ? define(['../moment'], factory) :
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
    factory(global.moment)
-}(this, (function (moment) { 'use strict';
+}(this, function (moment) { 'use strict';
 
 
-var translator = {
-    words: { //Different grammatical cases
-        m: ['jedan minut', 'jedne minute'],
-        mm: ['minut', 'minute', 'minuta'],
-        h: ['jedan sat', 'jednog sata'],
-        hh: ['sat', 'sata', 'sati'],
-        dd: ['dan', 'dana', 'dana'],
-        MM: ['mesec', 'meseca', 'meseci'],
-        yy: ['godina', 'godine', 'godina']
-    },
-    correctGrammaticalCase: function (number, wordKey) {
-        return number === 1 ? wordKey[0] : (number >= 2 && number <= 4 ? wordKey[1] : wordKey[2]);
-    },
-    translate: function (number, withoutSuffix, key) {
-        var wordKey = translator.words[key];
-        if (key.length === 1) {
-            return withoutSuffix ? wordKey[0] : wordKey[1];
-        } else {
-            return number + ' ' + translator.correctGrammaticalCase(number, wordKey);
+    var translator = {
+        words: { //Different grammatical cases
+            m: ['један минут', 'једне минуте'],
+            mm: ['минут', 'минуте', 'минута'],
+            h: ['један сат', 'једног сата'],
+            hh: ['сат', 'сата', 'сати'],
+            dd: ['дан', 'дана', 'дана'],
+            MM: ['месец', 'месеца', 'месеци'],
+            yy: ['година', 'године', 'година']
+        },
+        correctGrammaticalCase: function (number, wordKey) {
+            return number === 1 ? wordKey[0] : (number >= 2 && number <= 4 ? wordKey[1] : wordKey[2]);
+        },
+        translate: function (number, withoutSuffix, key) {
+            var wordKey = translator.words[key];
+            if (key.length === 1) {
+                return withoutSuffix ? wordKey[0] : wordKey[1];
+            } else {
+                return number + ' ' + translator.correctGrammaticalCase(number, wordKey);
+            }
         }
-    }
-};
+    };
 
-var sr = moment.defineLocale('sr', {
-    months: 'januar_februar_mart_april_maj_jun_jul_avgust_septembar_oktobar_novembar_decembar'.split('_'),
-    monthsShort: 'jan._feb._mar._apr._maj_jun_jul_avg._sep._okt._nov._dec.'.split('_'),
-    monthsParseExact: true,
-    weekdays: 'nedelja_ponedeljak_utorak_sreda_četvrtak_petak_subota'.split('_'),
-    weekdaysShort: 'ned._pon._uto._sre._čet._pet._sub.'.split('_'),
-    weekdaysMin: 'ne_po_ut_sr_če_pe_su'.split('_'),
-    weekdaysParseExact : true,
-    longDateFormat: {
-        LT: 'H:mm',
-        LTS : 'H:mm:ss',
-        L: 'DD.MM.YYYY',
-        LL: 'D. MMMM YYYY',
-        LLL: 'D. MMMM YYYY H:mm',
-        LLLL: 'dddd, D. MMMM YYYY H:mm'
-    },
-    calendar: {
-        sameDay: '[danas u] LT',
-        nextDay: '[sutra u] LT',
-        nextWeek: function () {
-            switch (this.day()) {
+    var sr_cyrl = moment.defineLocale('sr-cyrl', {
+        months: ['јануар', 'фебруар', 'март', 'април', 'мај', 'јун', 'јул', 'август', 'септембар', 'октобар', 'новембар', 'децембар'],
+        monthsShort: ['јан.', 'феб.', 'мар.', 'апр.', 'мај', 'јун', 'јул', 'авг.', 'сеп.', 'окт.', 'нов.', 'дец.'],
+        weekdays: ['недеља', 'понедељак', 'уторак', 'среда', 'четвртак', 'петак', 'субота'],
+        weekdaysShort: ['нед.', 'пон.', 'уто.', 'сре.', 'чет.', 'пет.', 'суб.'],
+        weekdaysMin: ['не', 'по', 'ут', 'ср', 'че', 'пе', 'су'],
+        longDateFormat: {
+            LT: 'H:mm',
+            LTS : 'H:mm:ss',
+            L: 'DD. MM. YYYY',
+            LL: 'D. MMMM YYYY',
+            LLL: 'D. MMMM YYYY H:mm',
+            LLLL: 'dddd, D. MMMM YYYY H:mm'
+        },
+        calendar: {
+            sameDay: '[данас у] LT',
+            nextDay: '[сутра у] LT',
+            nextWeek: function () {
+                switch (this.day()) {
                 case 0:
-                    return '[u] [nedelju] [u] LT';
+                    return '[у] [недељу] [у] LT';
                 case 3:
-                    return '[u] [sredu] [u] LT';
+                    return '[у] [среду] [у] LT';
                 case 6:
-                    return '[u] [subotu] [u] LT';
+                    return '[у] [суботу] [у] LT';
                 case 1:
                 case 2:
                 case 4:
                 case 5:
-                    return '[u] dddd [u] LT';
-            }
+                    return '[у] dddd [у] LT';
+                }
+            },
+            lastDay  : '[јуче у] LT',
+            lastWeek : function () {
+                var lastWeekDays = [
+                    '[прошле] [недеље] [у] LT',
+                    '[прошлог] [понедељка] [у] LT',
+                    '[прошлог] [уторка] [у] LT',
+                    '[прошле] [среде] [у] LT',
+                    '[прошлог] [четвртка] [у] LT',
+                    '[прошлог] [петка] [у] LT',
+                    '[прошле] [суботе] [у] LT'
+                ];
+                return lastWeekDays[this.day()];
+            },
+            sameElse : 'L'
         },
-        lastDay  : '[juče u] LT',
-        lastWeek : function () {
-            var lastWeekDays = [
-                '[prošle] [nedelje] [u] LT',
-                '[prošlog] [ponedeljka] [u] LT',
-                '[prošlog] [utorka] [u] LT',
-                '[prošle] [srede] [u] LT',
-                '[prošlog] [četvrtka] [u] LT',
-                '[prošlog] [petka] [u] LT',
-                '[prošle] [subote] [u] LT'
-            ];
-            return lastWeekDays[this.day()];
+        relativeTime : {
+            future : 'за %s',
+            past   : 'пре %s',
+            s      : 'неколико секунди',
+            m      : translator.translate,
+            mm     : translator.translate,
+            h      : translator.translate,
+            hh     : translator.translate,
+            d      : 'дан',
+            dd     : translator.translate,
+            M      : 'месец',
+            MM     : translator.translate,
+            y      : 'годину',
+            yy     : translator.translate
         },
-        sameElse : 'L'
-    },
-    relativeTime : {
-        future : 'za %s',
-        past   : 'pre %s',
-        s      : 'nekoliko sekundi',
-        m      : translator.translate,
-        mm     : translator.translate,
-        h      : translator.translate,
-        hh     : translator.translate,
-        d      : 'dan',
-        dd     : translator.translate,
-        M      : 'mesec',
-        MM     : translator.translate,
-        y      : 'godinu',
-        yy     : translator.translate
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}\./,
-    ordinal : '%d.',
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 7  // The week that contains Jan 1st is the first week of the year.
-    }
-});
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
 
-return sr;
+    return sr_cyrl;
 
-})));
+}));

interfaces/Glitter/templates/static/javascripts/momentjs_locale/sv.js

@@ -1,69 +1,66 @@
 //! moment.js locale configuration
-//! locale : Swedish [sv]
+//! locale : swedish (sv)
 //! author : Jens Alm : https://github.com/ulmus
 
-;(function (global, factory) {
-   typeof exports === 'object' && typeof module !== 'undefined'
-       && typeof require === 'function' ? factory(require('../moment')) :
-   typeof define === 'function' && define.amd ? define(['../moment'], factory) :
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
    factory(global.moment)
-}(this, (function (moment) { 'use strict';
+}(this, function (moment) { 'use strict';
 
 
-var sv = moment.defineLocale('sv', {
-    months : 'januari_februari_mars_april_maj_juni_juli_augusti_september_oktober_november_december'.split('_'),
-    monthsShort : 'jan_feb_mar_apr_maj_jun_jul_aug_sep_okt_nov_dec'.split('_'),
-    weekdays : 'söndag_måndag_tisdag_onsdag_torsdag_fredag_lördag'.split('_'),
-    weekdaysShort : 'sön_mån_tis_ons_tor_fre_lör'.split('_'),
-    weekdaysMin : 'sö_må_ti_on_to_fr_lö'.split('_'),
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'YYYY-MM-DD',
-        LL : 'D MMMM YYYY',
-        LLL : 'D MMMM YYYY [kl.] HH:mm',
-        LLLL : 'dddd D MMMM YYYY [kl.] HH:mm',
-        lll : 'D MMM YYYY HH:mm',
-        llll : 'ddd D MMM YYYY HH:mm'
-    },
-    calendar : {
-        sameDay: '[Idag] LT',
-        nextDay: '[Imorgon] LT',
-        lastDay: '[Igår] LT',
-        nextWeek: '[På] dddd LT',
-        lastWeek: '[I] dddd[s] LT',
-        sameElse: 'L'
-    },
-    relativeTime : {
-        future : 'om %s',
-        past : 'för %s sedan',
-        s : 'några sekunder',
-        m : 'en minut',
-        mm : '%d minuter',
-        h : 'en timme',
-        hh : '%d timmar',
-        d : 'en dag',
-        dd : '%d dagar',
-        M : 'en månad',
-        MM : '%d månader',
-        y : 'ett år',
-        yy : '%d år'
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}(e|a)/,
-    ordinal : function (number) {
-        var b = number % 10,
-            output = (~~(number % 100 / 10) === 1) ? 'e' :
-            (b === 1) ? 'a' :
-            (b === 2) ? 'a' :
-            (b === 3) ? 'e' : 'e';
-        return number + output;
-    },
-    week : {
-        dow : 1, // Monday is the first day of the week.
-        doy : 4  // The week that contains Jan 4th is the first week of the year.
-    }
-});
+    var sv = moment.defineLocale('sv', {
+        months : 'januari_februari_mars_april_maj_juni_juli_augusti_september_oktober_november_december'.split('_'),
+        monthsShort : 'jan_feb_mar_apr_maj_jun_jul_aug_sep_okt_nov_dec'.split('_'),
+        weekdays : 'söndag_måndag_tisdag_onsdag_torsdag_fredag_lördag'.split('_'),
+        weekdaysShort : 'sön_mån_tis_ons_tor_fre_lör'.split('_'),
+        weekdaysMin : 'sö_må_ti_on_to_fr_lö'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'YYYY-MM-DD',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY HH:mm',
+            LLLL : 'dddd D MMMM YYYY HH:mm'
+        },
+        calendar : {
+            sameDay: '[Idag] LT',
+            nextDay: '[Imorgon] LT',
+            lastDay: '[Igår] LT',
+            nextWeek: '[På] dddd LT',
+            lastWeek: '[I] dddd[s] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'om %s',
+            past : 'för %s sedan',
+            s : 'några sekunder',
+            m : 'en minut',
+            mm : '%d minuter',
+            h : 'en timme',
+            hh : '%d timmar',
+            d : 'en dag',
+            dd : '%d dagar',
+            M : 'en månad',
+            MM : '%d månader',
+            y : 'ett år',
+            yy : '%d år'
+        },
+        ordinalParse: /\d{1,2}(e|a)/,
+        ordinal : function (number) {
+            var b = number % 10,
+                output = (~~(number % 100 / 10) === 1) ? 'e' :
+                (b === 1) ? 'a' :
+                (b === 2) ? 'a' :
+                (b === 3) ? 'e' : 'e';
+            return number + output;
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
 
-return sv;
+    return sv;
 
-})));
+}));

interfaces/Glitter/templates/static/javascripts/momentjs_locale/zh-cn.js

@@ -1,76 +1,91 @@
 //! moment.js locale configuration
-//! locale : Chinese (China) [zh-cn]
+//! locale : chinese (zh-cn)
 //! author : suupic : https://github.com/suupic
 //! author : Zeno Zeng : https://github.com/zenozeng
 
-;(function (global, factory) {
-   typeof exports === 'object' && typeof module !== 'undefined'
-       && typeof require === 'function' ? factory(require('../moment')) :
-   typeof define === 'function' && define.amd ? define(['../moment'], factory) :
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
    factory(global.moment)
-}(this, (function (moment) { 'use strict';
+}(this, function (moment) { 'use strict';
 
 
-var zhCn = moment.defineLocale('zh-cn', {
-    months : '一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月'.split('_'),
-    monthsShort : '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'),
-    weekdays : '星期日_星期一_星期二_星期三_星期四_星期五_星期六'.split('_'),
-    weekdaysShort : '周日_周一_周二_周三_周四_周五_周六'.split('_'),
-    weekdaysMin : '日_一_二_三_四_五_六'.split('_'),
-    longDateFormat : {
-        LT : 'HH:mm',
-        LTS : 'HH:mm:ss',
-        L : 'YYYY年MMMD日',
-        LL : 'YYYY年MMMD日',
-        LLL : 'YYYY年MMMD日Ah点mm分',
-        LLLL : 'YYYY年MMMD日ddddAh点mm分',
-        l : 'YYYY年MMMD日',
-        ll : 'YYYY年MMMD日',
-        lll : 'YYYY年MMMD日 HH:mm',
-        llll : 'YYYY年MMMD日dddd HH:mm'
-    },
-    meridiemParse: /凌晨|早上|上午|中午|下午|晚上/,
-    meridiemHour: function (hour, meridiem) {
-        if (hour === 12) {
-            hour = 0;
-        }
-        if (meridiem === '凌晨' || meridiem === '早上' ||
-                meridiem === '上午') {
-            return hour;
-        } else if (meridiem === '下午' || meridiem === '晚上') {
-            return hour + 12;
-        } else {
-            // '中午'
-            return hour >= 11 ? hour : hour + 12;
-        }
-    },
-    meridiem : function (hour, minute, isLower) {
-        var hm = hour * 100 + minute;
-        if (hm < 600) {
-            return '凌晨';
-        } else if (hm < 900) {
-            return '早上';
-        } else if (hm < 1130) {
-            return '上午';
-        } else if (hm < 1230) {
-            return '中午';
-        } else if (hm < 1800) {
-            return '下午';
-        } else {
-            return '晚上';
-        }
-    },
-    calendar : {
-        sameDay : '[今天]LT',
-        nextDay : '[明天]LT',
-        nextWeek : '[下]ddddLT',
-        lastDay : '[昨天]LT',
-        lastWeek : '[上]ddddLT',
-        sameElse : 'L'
-    },
-    dayOfMonthOrdinalParse: /\d{1,2}(日|月|周)/,
-    ordinal : function (number, period) {
-        switch (period) {
+    var zh_cn = moment.defineLocale('zh-cn', {
+        months : '一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月'.split('_'),
+        monthsShort : '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'),
+        weekdays : '星期日_星期一_星期二_星期三_星期四_星期五_星期六'.split('_'),
+        weekdaysShort : '周日_周一_周二_周三_周四_周五_周六'.split('_'),
+        weekdaysMin : '日_一_二_三_四_五_六'.split('_'),
+        longDateFormat : {
+            LT : 'Ah点mm分',
+            LTS : 'Ah点m分s秒',
+            L : 'YYYY-MM-DD',
+            LL : 'YYYY年MMMD日',
+            LLL : 'YYYY年MMMD日Ah点mm分',
+            LLLL : 'YYYY年MMMD日ddddAh点mm分',
+            l : 'YYYY-MM-DD',
+            ll : 'YYYY年MMMD日',
+            lll : 'YYYY年MMMD日Ah点mm分',
+            llll : 'YYYY年MMMD日ddddAh点mm分'
+        },
+        meridiemParse: /凌晨|早上|上午|中午|下午|晚上/,
+        meridiemHour: function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === '凌晨' || meridiem === '早上' ||
+                    meridiem === '上午') {
+                return hour;
+            } else if (meridiem === '下午' || meridiem === '晚上') {
+                return hour + 12;
+            } else {
+                // '中午'
+                return hour >= 11 ? hour : hour + 12;
+            }
+        },
+        meridiem : function (hour, minute, isLower) {
+            var hm = hour * 100 + minute;
+            if (hm < 600) {
+                return '凌晨';
+            } else if (hm < 900) {
+                return '早上';
+            } else if (hm < 1130) {
+                return '上午';
+            } else if (hm < 1230) {
+                return '中午';
+            } else if (hm < 1800) {
+                return '下午';
+            } else {
+                return '晚上';
+            }
+        },
+        calendar : {
+            sameDay : function () {
+                return this.minutes() === 0 ? '[今天]Ah[点整]' : '[今天]LT';
+            },
+            nextDay : function () {
+                return this.minutes() === 0 ? '[明天]Ah[点整]' : '[明天]LT';
+            },
+            lastDay : function () {
+                return this.minutes() === 0 ? '[昨天]Ah[点整]' : '[昨天]LT';
+            },
+            nextWeek : function () {
+                var startOfWeek, prefix;
+                startOfWeek = moment().startOf('week');
+                prefix = this.unix() - startOfWeek.unix() >= 7 * 24 * 3600 ? '[下]' : '[本]';
+                return this.minutes() === 0 ? prefix + 'dddAh点整' : prefix + 'dddAh点mm';
+            },
+            lastWeek : function () {
+                var startOfWeek, prefix;
+                startOfWeek = moment().startOf('week');
+                prefix = this.unix() < startOfWeek.unix()  ? '[上]' : '[本]';
+                return this.minutes() === 0 ? prefix + 'dddAh点整' : prefix + 'dddAh点mm';
+            },
+            sameElse : 'LL'
+        },
+        ordinalParse: /\d{1,2}(日|月|周)/,
+        ordinal : function (number, period) {
+            switch (period) {
             case 'd':
             case 'D':
             case 'DDD':
@@ -82,30 +97,30 @@ var zhCn = moment.defineLocale('zh-cn', {
                 return number + '周';
             default:
                 return number;
+            }
+        },
+        relativeTime : {
+            future : '%s内',
+            past : '%s前',
+            s : '几秒',
+            m : '1 分钟',
+            mm : '%d 分钟',
+            h : '1 小时',
+            hh : '%d 小时',
+            d : '1 天',
+            dd : '%d 天',
+            M : '1 个月',
+            MM : '%d 个月',
+            y : '1 年',
+            yy : '%d 年'
+        },
+        week : {
+            // GB/T 7408-1994《数据元和交换格式·信息交换·日期和时间表示法》与ISO 8601:1988等效
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
         }
-    },
-    relativeTime : {
-        future : '%s内',
-        past : '%s前',
-        s : '几秒',
-        m : '1 分钟',
-        mm : '%d 分钟',
-        h : '1 小时',
-        hh : '%d 小时',
-        d : '1 天',
-        dd : '%d 天',
-        M : '1 个月',
-        MM : '%d 个月',
-        y : '1 年',
-        yy : '%d 年'
-    },
-    week : {
-        // GB/T 7408-1994《数据元和交换格式·信息交换·日期和时间表示法》与ISO 8601:1988等效
-        dow : 1, // Monday is the first day of the week.
-        doy : 4  // The week that contains Jan 4th is the first week of the year.
-    }
-});
+    });
 
-return zhCn;
+    return zh_cn;
 
-})));
+}));

interfaces/Glitter/templates/static/stylesheets/colorschemes/Night.css

@@ -50,8 +50,7 @@ legend,
     color: white !important;
 }
 
-.hover-button,
-.fileControls a:hover {
+.hover-button {
     opacity: 0.7;
 }
 
@@ -76,14 +75,13 @@ legend,
     background-color: #666;
 }
 
-.navbar-collapse.in .dropdown-menu, {
+.navbar-collapse.in .dropdown-menu {
     border: none;
 }
 
 .max-speed-input-clear,
 .max-speed-input-clear:hover,
-.nav-tabs>li>a:hover,
-.fileControls a {
+.nav-tabs>li>a:hover {
     color: black;
 }
 
@@ -111,7 +109,6 @@ legend,
     color: #EBEBEB;
 }
 
-table,
 .table-striped>tbody>tr:nth-child(even)>td,
 .table>tbody>tr:nth-child(even)>td,
 .table th,
@@ -159,9 +156,7 @@ select.form-control,
 .retry-button, .retry-button-inactive,
 .history-options-show-failed,
 .queue-error-info,
-.options-bad-status,
-.history-failed-download:hover .retry-button .glyphicon:before,
-.retry-button:hover .glyphicon:before {
+.options-bad-status {
     color: #F95151 !important;
 }
 
@@ -180,7 +175,7 @@ tbody .caret {
     color: #D6D6D6;
 }
 
-td.name .name-icons span,
+td.name .name-ratings span,
 .navbar-nav .open .dropdown-menu>li>a,
 .dropdown-header,
 #modal-help small,
@@ -208,10 +203,6 @@ hr {
     border-bottom: none !important;
 }
 
-#modal-item-files .item-files-table {
-    border-bottom: 1px solid black;
-}
-
 .history-queue-swicher .nav-tabs>li>a,
 .history-queue-swicher .nav-tabs>li.active>a  {
     border-bottom: none;
@@ -229,11 +220,6 @@ hr {
     box-shadow: inset 1px 0px 1px rgba(0, 0, 0, 1);
 }
 
-.modal-content {
-    border-color: #727272;
-    border-top: none;
-}
-
 /* Placeholders - Will not work if grouped! */
 ::-webkit-input-placeholder {
    color: #EBEBEB !important;

interfaces/Glitter/templates/static/stylesheets/glitter.css

@@ -52,8 +52,8 @@ h2 {
     box-shadow: 0 2px 2px rgba(0, 0, 0, 0.1);
     background-color: #ffffff;
     border: 1px solid #cccccc;
-    margin-left: -220px;
-    margin-top: 5px;
+    margin-left: -150px;
+    margin-top: 4px;
 }
 
 .navbar-collapse.in .dropdown-menu a,
@@ -533,16 +533,9 @@ tbody>tr>td:last-child {
 }
 
 .hover-button.disabled,
-.hover-button.disabled:hover,
-.name-options.disabled .hover-button,
-.name-options.disabled .hover-button:hover {
+.hover-button.disabled:hover {
     cursor: not-allowed !important;
     opacity: 0.1 !important;
-    pointer-events: none;
-}
-
-.name-options.disabled {
-    cursor: not-allowed !important;
 }
 
 .info-container {
@@ -624,7 +617,6 @@ td.name .row-wrap-text {
 }
 
 .queue-table td.name .name-options small,
-.queue-table td.name .direct-unpack,
 .queue-item-password {
     opacity: 0.5;
 }
@@ -634,7 +626,7 @@ td.name .row-wrap-text {
 }
 
 .queue-table td.name:hover .row-wrap-text {
-    max-width: calc(100% - 125px);
+    max-width: calc(100% - 85px);
  /* Change for each size! */
 }
 
@@ -656,23 +648,19 @@ td.name .row-wrap-text {
     border: 1px solid #ccc;
 }
 
-td.name .name-icons {
+td.name .name-ratings {
     display: inline;
     margin-left: 5px;
     color: black !important;
     text-decoration: none !important;
 }
 
-td.name .name-icons .glyphicon {
-    margin-left: 2px;
-    top: 2px;
-    font-weight: bold;
+.queue-table td.name:hover .name-ratings {
+    display: none;
 }
 
-.glyphicon-chevron-down,
-.glyphicon-chevron-up  {
-    top: 2px;
-    font-weight: bold;
+td.name .name-ratings .glyphicon {
+    margin-left: 2px;
 }
 
 tbody.no-downloads tr td {
@@ -781,35 +769,6 @@ tr.queue-item>td:first-child>a {
     padding-right: 10px;
 }
 
-.item-files-table tr .fileControls{
-    float:right;
-    display:none;
-}
-
-.item-files-table tr.files-sortable:hover .fileControls{
-    float:right;
-    display:block;
-    margin-left:5px;
-}
-
-.progress .progress-bar .fileDetails {
-    display:inline;
-    text-align: left;
-    margin-left: 70px;
-    line-height: 25px;
-    position: absolute;
-    top: 0;
-    left: 0;
-    z-index: 2;
-    font-size: 12px;
-    color: #404040;
-    padding-right: 0px;
-}
-
-.progress .progress-bar .fileDetails>span {
-    float: left;
-}
-
 .progress strong {
     font-size: 13px;
 }
@@ -1076,7 +1035,7 @@ tr.queue-item>td:first-child>a {
     opacity: 1;
 }
 
-.history-ratings .name-icons {
+.history-ratings .name-ratings {
     float: none !important;
 }
 
@@ -1664,11 +1623,6 @@ input[name="nzbURL"] {
 
 #modal-item-files .item-files-table .progress small {
     color: #727272 !important;
-    margin-left: 5px;
-}
-
-#modal-item-files .item-files-table tr.files-sortable:hover .progress small {
-    display:none;
 }
 
 #modal-item-files .item-files-table td {
@@ -1856,7 +1810,7 @@ input[name="nzbURL"] {
 }
 
 @media screen and (max-width: 1200px) {
-    td.name .name-icons {
+    td.name .name-ratings {
         margin-left: 0px;
         margin-right: -5px;
         display: block;
@@ -1903,11 +1857,6 @@ input[name="nzbURL"] {
     .queue .sortable-placeholder td {
         padding: 9px 0px 8px !important;
     }
-
-    .queue-table .buttonMoveToBottom,
-    .queue-table .buttonMoveToTop {
-        display: inline;
-    }
 }
 
 @media screen and (min-height: 800px) {
@@ -1972,6 +1921,49 @@ input[name="nzbURL"] {
     }
 }
 
+/***
+    SPECIAL FOR FIREFOX
+    It uses very high CPU for anything animated (Sep 2015)
+    Disable animations on progress-bar and make the History-'processing' a block animation
+    Can be removed if it's performance gets better in the future..
+***/
+@supports (-moz-transform: translate(0, 0)) {
+    .progress-bar {
+        transform: none !important;
+        animation: none !important;
+        transition: none !important;
+    }
+
+    @keyframes stretchdelay {
+        0%, 60% {
+            transform: scaleY(0.4);
+        }
+
+        61%, 100% {
+            transform: scaleY(1.0);
+        }
+    }
+
+    .processing-download > div {
+        animation: stretchdelay 2s infinite linear;
+    }
+
+    .processing-download .loader-bar-two {
+        animation-delay: 0.2s;
+    }
+
+    .processing-download .loader-bar-three {
+        animation-delay: 0.4s;
+    }
+
+    .processing-download .loader-bar-four {
+        animation-delay: 0.6s;
+    }
+
+    .queue-table td.name input {
+        margin-left: -2px;
+    }
+}
 
 /***
     Bootstrap overwrites

interfaces/Glitter/templates/static/stylesheets/glitter.mobile.css

@@ -132,11 +132,6 @@ h2 {
     max-width: calc(100% - 45px);
 }
 
-.queue-table .buttonMoveToBottom,
-.queue-table .buttonMoveToTop {
-    display: none;
-}
-
 tr.queue-item>td:first-child>a {
     margin-top: 3px;
 }

interfaces/Plush/README.txt

@@ -1,7 +1,7 @@
 
 Plush for SABnzbd 0.6.x | Feb. 21 2010
 assembled by pairofdimes - see LICENSE-CC.txt
-https://forums.sabnzbd.org contributions welcome
+http://forums.sabnzbd.org contributions welcome
 
 ======================
 THANKS TO CONTRIBUTORS

interfaces/Plush/templates/_inc_header.tmpl

@@ -101,7 +101,6 @@
       <div id="nav_text_left">
         <span id="warning_box"><b><a href="${path}status/#tabs-warnings" id="last_warning" title="#echo $last_warning.replace("\n"," ").replace('"',"'") #"><span id="have_warnings">$have_warnings</span> $T('warnings')</a></b></span>
         #if $pane=="Main"#
-          &sdot; <a href="${path}config/general#web_dir">#echo $T('useGlitter').split('.')[0]#.</a>
           #if $new_release#&sdot; <a href="$new_rel_url" id="new_release" target="_blank">$T('Plush-updateAvailable').replace(' ','&nbsp;')</a>#end if#
         #end if#
       </div>

interfaces/Plush/templates/_inc_modals.tmpl

@@ -23,8 +23,8 @@
   <div id="help_modal">
     <table>
       <tr><td><strong>$T('menu-wiki'):</strong></td><td><a href="$helpuri$help_uri" target="_blank">$helpuri$help_uri</a></td></tr>
-      <tr><td><strong>$T('menu-forums'):</strong></td><td><a href="https://forums.sabnzbd.org/" target="_blank">https://forums.sabnzbd.org/</a></td></tr>
-      <tr><td><strong>$T('menu-irc'):</strong></td><td><a href="https://sabnzbd.org/live-chat.html" target="_blank">https://sabnzbd.org/live-chat.html</a></td></tr>
+      <tr><td><strong>$T('menu-forums'):</strong></td><td><a href="http://forums.sabnzbd.org/" target="_blank">http://forums.sabnzbd.org/</a></td></tr>
+      <tr><td><strong>$T('menu-irc'):</strong></td><td><a href="http://www.sabnzbd.org/live-chat/" target="_blank">http://www.sabnzbd.org/live-chat/</a></td></tr>
     </table>
     <div class="sabnzbd_logo main_sprite_container sprite_sabnzbdplus_logo"></div>
     <p><strong>SABnzbd $T('version'):</strong> $version</p>

interfaces/Plush/templates/static/stylesheets/colorschemes/gold/gold.css

@@ -109,6 +109,11 @@ body {
   font-weight: bold;
 }
 
+#new_release {
+  color: green;
+  font-weight: bold;
+}
+
 #livetip {
   position: absolute;
   background-color: #cfc;
@@ -338,7 +343,6 @@ body {
   clear:left;
   padding: 0 20px 0 25px;
   font-size:90%;
-  font-weight: bold;
 }
 #nav_text_left a, #nav_text_right a {
   color:#000;
@@ -1079,7 +1083,7 @@ tr:hover .history_added { color: black; }
   color: red;
   margin-left: 10px;
 }
-
+ 
 .rating_icon_vision {
   width: 16px;
   height: 16px;