Merge branch 'refs/heads/develop'

couchpotato/core/downloaders/transmission/main.py

@@ -38,10 +38,11 @@ class Transmission(Downloader):
             'download-dir': folder_path
         }
 
-        torrent_params = {
-            'seedRatioLimit': self.conf('ratio'),
-            'seedRatioMode': (0 if self.conf('ratio') else 1)
-        }
+        if self.conf('ratio'):
+            torrent_params = {
+                'seedRatioLimit': self.conf('ratio'),
+                'seedRatioMode': self.conf('ratio')
+            }
 
         if not filedata and data.get('type') == 'torrent':
             log.error('Failed sending torrent, no data')

couchpotato/core/notifications/email/main.py

@@ -15,9 +15,9 @@ class Email(Notification):
 
         # Extract all the settings from settings
         from_address = self.conf('from')
-        to = self.conf('to')
-        smtp_server = self.conf('smtp_server')
+        to_address = self.conf('to')
         ssl = self.conf('ssl')
+        smtp_server = self.conf('smtp_server')
         smtp_user = self.conf('smtp_user')
         smtp_pass = self.conf('smtp_pass')
 
@@ -25,22 +25,27 @@ class Email(Notification):
         message = MIMEText(toUnicode(message))
         message['Subject'] = self.default_title
         message['From'] = from_address
-        message['To'] = to
+        message['To'] = to_address
 
         try:
             # Open the SMTP connection, via SSL if requested
+            log.debug("SMTP over SSL %s", ("enabled" if ssl == 1 else "disabled"))
             mailserver = smtplib.SMTP_SSL(smtp_server) if ssl == 1 else smtplib.SMTP(smtp_server)
 
             # Check too see if an login attempt should be attempted
             if len(smtp_user) > 0:
+                log.debug("Logging on to SMTP server using username \'%s\'%s", (smtp_user, " and a password" if len(smtp_pass) > 0 else ""))
                 mailserver.login(smtp_user, smtp_pass)
 
             # Send the e-mail
-            mailserver.sendmail(from_address, to, message.as_string())
+            log.debug("Sending the email")
+            mailserver.sendmail(from_address, to_address, message.as_string())
 
             # Close the SMTP connection
             mailserver.quit()
-            log.info('Email notifications sent.')
+
+            log.info('Email notification sent')
+
             return True
         except:
             log.error('E-mail failed: %s', traceback.format_exc())

couchpotato/core/notifications/notifymywp/__init__.py

@@ -10,7 +10,7 @@ config = [{
             'tab': 'notifications',
             'list': 'notification_providers',
             'name': 'notifymywp',
-            'label': 'Notify My Windows Phone',
+            'label': 'Windows Phone',
             'options': [
                 {
                     'name': 'enabled',

couchpotato/static/style/page/settings.css

@@ -176,7 +176,7 @@
 	
 		.page .option_list h3 {
 			padding: 0;
-			margin: 10px 0 0 0;
+			margin: 10px 5px 0;
 			text-align: center;
 			font-weight: normal;
 			text-shadow: none;
@@ -189,7 +189,7 @@
 		display: inline-block;
 		margin: 3px 3px 3px 20px;
 		padding: 4px 0;
-		width: 159px;
+		width: 173px;
 		vertical-align: top;
 	}
 		
@@ -629,14 +629,14 @@
 
 	.group_userscript .or {
 		float: left;
-		margin: 20px 10px;
+		margin: 20px -10px 0 10px;
 	}
 
 	.group_userscript .bookmarklet {
 		display: block;
 		display: block;
 		float: left;
-		padding: 20px 15px 0 0 ;
+		padding: 20px 15px 0 25px;
 		border-radius: 5px;
 	}