Merge branch 'master' into fix-7307

Conflicts:
	core/js/router.js
	settings/js/admin.js

7 files changed, 30 insertions, 21 deletions

diff --git a/core/css/icons.css b/core/css/icons.css
index 027a3f8557f..b41c7338612 100644
--- a/core/css/icons.css
+++ b/core/css/icons.css
@@ -156,11 +156,15 @@
 	background-image: url('../img/actions/sound-off.svg');
 }
 
-.icon-star {
+.icon-star,
+.icon-starred:hover,
+.icon-starred:focus {
 	background-image: url('../img/actions/star.svg');
 }
 
-.icon-starred {
+.icon-starred,
+.icon-star:hover,
+.icon-star:focus {
 	background-image: url('../img/actions/starred.svg');
 }
 
diff --git a/core/css/styles.css b/core/css/styles.css
index 082d2c714cf..69cf6df07d0 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -175,6 +175,7 @@ button, .button,
 	border: 1px solid rgba(190,190,190,.9);
 	cursor: pointer;
 	border-radius: 3px;
+	outline: none;
 }
 input[type="submit"]:hover, input[type="submit"]:focus,
 input[type="button"]:hover, input[type="button"]:focus,
@@ -204,18 +205,18 @@ textarea:disabled {
 /* Primary action button, use sparingly */
 .primary, input[type="submit"].primary, input[type="button"].primary, button.primary, .button.primary {
 	border: 1px solid #1d2d44;
-	background: #35537a;
+	background-color: #35537a;
 	color: #ddd;
 }
 	.primary:hover, input[type="submit"].primary:hover, input[type="button"].primary:hover, button.primary:hover, .button.primary:hover,
 	.primary:focus, input[type="submit"].primary:focus, input[type="button"].primary:focus, button.primary:focus, .button.primary:focus {
 		border: 1px solid #1d2d44;
-		background: #304d76;
+		background-color: #304d76;
 		color: #fff;
 	}
 	.primary:active, input[type="submit"].primary:active, input[type="button"].primary:active, button.primary:active, .button.primary:active {
 		border: 1px solid #1d2d44;
-		background: #1d2d44;
+		background-color: #1d2d44;
 		color: #bbb;
 	}
 
@@ -233,7 +234,7 @@ textarea:disabled {
 }
 
 input[type="submit"].enabled {
-	background: #66f866;
+	background-color: #66f866;
 	border: 1px solid #5e5;
 }
 
diff --git a/core/img/logo-mail.gif b/core/img/logo-mail.gif
index 6a1caaa9188..f1dd108450e 100644
--- a/core/img/logo-mail.gif
+++ b/core/img/logo-mail.gif
diff --git a/core/js/setup.js b/core/js/setup.js
index 279b5fbebb9..96719540f96 100644
--- a/core/js/setup.js
+++ b/core/js/setup.js
@@ -36,6 +36,7 @@ $(document).ready(function() {
 
 	$('#showAdvanced').click(function() {
 		$('#datadirContent').slideToggle(250);
+		$('#databaseBackend').slideToggle(250);
 		$('#databaseField').slideToggle(250);
 	});
 	$("form").submit(function(){
@@ -73,6 +74,7 @@ $(document).ready(function() {
 
 	if (currentDbType === 'sqlite' || (dbtypes.sqlite && currentDbType === undefined)){
 		$('#datadirContent').hide(250);
+		$('#databaseBackend').hide(250);
 		$('#databaseField').hide(250);
 	}
 
diff --git a/core/js/share.js b/core/js/share.js
index 0939259b7da..129e50b22d5 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -584,8 +584,8 @@ $(document).ready(function() {
 				$(checkboxes).filter('input[name="edit"]').attr('checked', false);
 			// Check Edit if Create, Update, or Delete is checked
 			} else if (($(this).attr('name') == 'create'
-					 || $(this).attr('name') == 'update'
-					 || $(this).attr('name') == 'delete'))
+				|| $(this).attr('name') == 'update'
+				|| $(this).attr('name') == 'delete'))
 			{
 				$(checkboxes).filter('input[name="edit"]').attr('checked', true);
 			}
diff --git a/core/templates/installation.php b/core/templates/installation.php
index d9f3c38ab11..e2d296a713f 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -84,7 +84,7 @@
 	<?php endif; ?>
 
 	<?php if(!$_['dbIsSet'] OR count($_['errors']) > 0): ?>
-	<fieldset id='databaseField'>
+	<fieldset id='databaseBackend'>
 		<?php if($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle'] or $_['hasMSSQL'])
 			$hasOtherDB = true; else $hasOtherDB =false; //other than SQLite ?>
 		<legend><?php p($l->t( 'Configure the database' )); ?></legend>
@@ -100,8 +100,10 @@
 		<?php endif; ?>
 		<?php endforeach; ?>
 		</div>
+	</fieldset>
 
 		<?php if($hasOtherDB): ?>
+		<fieldset id='databaseField'>
 		<div id="use_other_db">
 			<p class="infield grouptop">
 				<label for="dbuser" class="infield"><?php p($l->t( 'Database user' )); ?></label>
@@ -141,8 +143,8 @@
 					autocomplete="off" autocapitalize="off" autocorrect="off" />
 			</p>
 		</div>
+		</fieldset>
 		<?php endif; ?>
-	</fieldset>
 	<?php endif; ?>
 
 	<div class="buttons"><input type="submit" class="primary" value="<?php p($l->t( 'Finish setup' )); ?>" data-finishing="<?php p($l->t( 'Finishing …' )); ?>" /></div>
diff --git a/core/templates/mail.php b/core/templates/mail.php
index b8b0a2bfe96..ae46eaca788 100644
--- a/core/templates/mail.php
+++ b/core/templates/mail.php
@@ -2,15 +2,15 @@
 <tr><td>
 <table cellspacing="0" cellpadding="0" border="0" width="600px">
 <tr>
-<td bgcolor="#1d2d44" width="20px">&nbsp;</td>
-<td bgcolor="#1d2d44">
-<img src="<?php print_unescaped(OC_Helper::makeURLAbsolute(image_path('', 'logo-mail.gif'))); ?>" alt="<?php p($theme->getName()); ?>"/>
+<td bgcolor="<?php p($theme->getMailHeaderColor());?>" width="20px">&nbsp;</td>
+<td bgcolor="<?php p($theme->getMailHeaderColor());?>">
+<img src="<?php p(OC_Helper::makeURLAbsolute(image_path('', 'logo-mail.gif'))); ?>" alt="<?php p($theme->getName()); ?>"/>
 </td>
 </tr>
-<tr><td bgcolor="#f8f8f8" colspan="2">&nbsp;</td></tr>
+<tr><td colspan="2">&nbsp;</td></tr>
 <tr>
-<td bgcolor="#f8f8f8" width="20px">&nbsp;</td>
-<td bgcolor="#f8f8f8" style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">
+<td width="20px">&nbsp;</td>
+<td style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">
 <?php
 print_unescaped($l->t('Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href="%s">View it!</a><br><br>', array($_['user_displayname'], $_['filename'], $_['link'])));
 if ( isset($_['expiration']) ) {
@@ -21,17 +21,17 @@ p($l->t('Cheers!'));
 ?>
 </td>
 </tr>
-<tr><td bgcolor="#f8f8f8" colspan="2">&nbsp;</td></tr>
+<tr><td colspan="2">&nbsp;</td></tr>
 <tr>
-<td bgcolor="#f8f8f8" width="20px">&nbsp;</td>
-<td bgcolor="#f8f8f8" style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">--<br>
+<td width="20px">&nbsp;</td>
+<td style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">--<br>
 <?php p($theme->getName()); ?> -
 <?php p($theme->getSlogan()); ?>
-<br><a href="<?php print_unescaped($theme->getBaseUrl()); ?>"><?php print_unescaped($theme->getBaseUrl());?></a>
+<br><a href="<?php p($theme->getBaseUrl()); ?>"><?php p($theme->getBaseUrl());?></a>
 </td>
 </tr>
 <tr>
-<td bgcolor="#f8f8f8" colspan="2">&nbsp;</td>
+<td colspan="2">&nbsp;</td>
 </tr>
 </table>
 </td></tr>