Refs #1490

 * all INPUT, SELECT, TEXTAREA, submit use same design across admin UI and main UI
 * fixed other small ui issues
 * removed brown title next to Piwik on all pages, as it was too ugly to look at 
 

git-svn-id: http://dev.piwik.org/svn/trunk@2807 59fd770c-687e-43c8-a1e3-f5a4ff64c105

22 files changed, 49 insertions, 116 deletions

diff --git a/plugins/CoreAdminHome/templates/generalSettings.tpl b/plugins/CoreAdminHome/templates/generalSettings.tpl
index 88f0ac756d..c0aebdaa79 100644
--- a/plugins/CoreAdminHome/templates/generalSettings.tpl
+++ b/plugins/CoreAdminHome/templates/generalSettings.tpl
@@ -100,7 +100,7 @@
 		<tr>
 			<td><label for="mailPassword">{'General_SmtpPassword'|translate}</label><br>
 				<span class="form-description">{'General_OnlyEnterIfRequiredPassword'|translate}<br/>
-				{'General_WarningPasswordStored'|translate}</span>
+				{'General_WarningPasswordStored'|translate:"<strong>":"</strong>"}</span>
 			</td>
 			<td>
 				<input type="password" id="mailPassword" value = "{$mail.password}" >
@@ -108,7 +108,6 @@
 		</tr>
 	</table>
 </div>
-</div>
 
 </table>
 <input type="submit" value="{'General_Save'|translate}" id="generalSettingsSubmit" class="submit" />
diff --git a/plugins/CoreAdminHome/templates/styles.css b/plugins/CoreAdminHome/templates/styles.css
index 8c3ec10a5f..d5f58438e4 100644
--- a/plugins/CoreAdminHome/templates/styles.css
+++ b/plugins/CoreAdminHome/templates/styles.css
@@ -1,9 +1,6 @@
 .admin img {
 	vertical-align: baseline;
 }
-textarea {
-	font-size: 1em;
-}
 .admin a {
 	color: black;
 }
@@ -64,21 +61,6 @@ table.admin  tbody td:hover, table.admin  tbody th:hover {
 	text-decoration: none;
 }
 
-#submit input {
-	font-size: 2em;
-	border-top: 2px solid #8cb648;
-	border-left: 2px solid #8cb648;
-	border-bottom: 2px solid #4a6026;
-	border-right: 2px solid #4a6026;
-	background-color: #6c8c37;
-	color: #fff;
-}
-
-#submit {
-	padding-top: 10px;
-	padding-left: 70px;
-}
-
 .warning {
 	border: 1px dotted gray;
 	padding: 15px;
@@ -106,20 +88,6 @@ table.admin  tbody td:hover, table.admin  tbody th:hover {
 	line-height:140%;
 	padding-bottom:20px;
 }
-.admin textarea, .admin input, .admin select {
-	background-color:#FFFFFF;
-	border-color:#939EA5;
-	-moz-border-radius:4px;
-	-webkit-border-radius:4px;
-	border-style:solid;
-	border-width:1px;
-	margin:1px;
-	padding:3px;
-}
-
-input[disabled] {
-	background-color:#F7F7F7;
-}
 .adminTable {
 	border-width: 1px;
 	border-style: solid;
diff --git a/plugins/CoreHome/templates/autocomplete.js b/plugins/CoreHome/templates/autocomplete.js
index da22db3b5c..8c1367517a 100644
--- a/plugins/CoreHome/templates/autocomplete.js
+++ b/plugins/CoreHome/templates/autocomplete.js
@@ -1,23 +1,23 @@
 
 $('.but').bind('click', function(e)
 {
-	if($('#keyword').val() != '')
-		$('#keyword').autocomplete('search', $('#keyword').val() + '%%%');
+	if($('#websiteSearch').val() != '')
+		$('#websiteSearch').autocomplete('search', $('#websiteSearch').val() + '%%%');
 	return false;
 });
 $(function() {
-	$("#keyword").click(function(e)
+	$("#websiteSearch").click(function(e)
 	{
 		$(this).val('');
 	});
-	$('#keyword').keyup(function(e)
+	$('#websiteSearch').keyup(function(e)
 	{
 		if(parseInt($(this).val().length) == 0)
 		{
 			reset();
 		}
 	});
-	$("#keyword").autocomplete({
+	$("#websiteSearch").autocomplete({
 		minLength: 1,
 		source: '?module=SitesManager&action=getSitesForAutocompleter',
 		select: function(event, ui) {
@@ -33,7 +33,7 @@ $(function() {
 			return false;
 		},
 		focus: function(event, ui) {
-			$('#keyword').val(ui.item.name);
+			$('#websiteSearch').val(ui.item.name);
 			return false;
 		},
 		search: function(event, ui) {
@@ -64,7 +64,7 @@ $(function() {
 	});
 	function reset()
 	{
-		$('#keyword').val('');
+		$('#websiteSearch').val('');
 		$('.custom_select_ul_list').show();
 		$(".ui-autocomplete").hide();
 		$("#reset").hide();
diff --git a/plugins/CoreHome/templates/datatable.css b/plugins/CoreHome/templates/datatable.css
index 1a0443236e..0502295b29 100644
--- a/plugins/CoreHome/templates/datatable.css
+++ b/plugins/CoreHome/templates/datatable.css
@@ -12,6 +12,9 @@
 	z-index:1;
 }
 
+.widget p {
+	margin-left:10px;
+}
 /* container of each table */
 .dataTableWrapper {
 	width: 450px;
diff --git a/plugins/CoreHome/templates/datatable.js b/plugins/CoreHome/templates/datatable.js
index d04f5682f5..d089c401cb 100644
--- a/plugins/CoreHome/templates/datatable.js
+++ b/plugins/CoreHome/templates/datatable.js
@@ -697,15 +697,15 @@ dataTable.prototype =
 			truncationOffset = 0;
 		}
 		var truncationLimit = 50;
-/*		Different truncation limit for different datatable types?
+		// Different truncation limit for different datatable types?
  		// in a subtable
 		if(typeof self.param.idSubtable != 'undefined') {}
 		// when showing all columns
 		if(typeof self.param.idSubtable == 'undefined'
-			&& self.param.viewDataTable == 'tableAllColumns') {}
+			&& self.param.viewDataTable == 'tableAllColumns') { truncationLimit = 25; }
 		// when showing all columns in a subtable, space is restricted
 		else if(self.param.viewDataTable == 'tableAllColumns') {}		
-*/		
+		
 		truncationLimit += truncationOffset;
 
 		$(domElemToTruncate).truncate(truncationLimit);
@@ -920,9 +920,6 @@ actionDataTable.prototype =
 				// label (first column of a data row) or not
 				$("td:first-child:odd", this).addClass('label labeleven');
 				$("td:first-child:even", this).addClass('label labelodd');
-				// we truncate the labels columns from the second row
-//				$("td:first-child", this).truncate(30);
-//			    $('.truncated', this).tooltip();
 			})
 			.removeClass('rowToProcess');
 	},
diff --git a/plugins/CoreHome/templates/logo.tpl b/plugins/CoreHome/templates/logo.tpl
index d0cd5cb852..61b05b41f2 100644
--- a/plugins/CoreHome/templates/logo.tpl
+++ b/plugins/CoreHome/templates/logo.tpl
@@ -2,5 +2,4 @@
 <a href="index.php" title="Piwik # {'General_OpenSourceWebAnalytics'|translate}" style="text-decoration: none;">
 	<span style="color: rgb(245, 223, 114);">P</span><span style="color: rgb(241, 175, 108);">i</span><span style="color: rgb(241, 117, 117);">w</span><span style="color: rgb(155, 106, 58);">i</span><span style="color: rgb(107, 50, 11);">k</span>
 </a>
-{if $currentModule != 'CoreHome'}<span style="padding-left:1em;font-size: 20pt; letter-spacing: -1pt; color: rgb(107, 50, 11);">&rsaquo; {$currentPluginName}</span>{/if}
 </span>
diff --git a/plugins/CoreHome/templates/sites_selection.tpl b/plugins/CoreHome/templates/sites_selection.tpl
index 0753a2bdf6..f1c8457dd8 100644
--- a/plugins/CoreHome/templates/sites_selection.tpl
+++ b/plugins/CoreHome/templates/sites_selection.tpl
@@ -1,6 +1,5 @@
 {if !$show_autocompleter}
 <div class="sites_selection">
-<span id="sitesSelectionWrapper" style="display:none;" >
 	<label>{'General_Website'|translate}</label><span id="selectedSiteName" style="display:none">{$siteName}</span>
 	<span id="sitesSelection">
 		<form action="{url idSite=null}" method="get">
@@ -61,7 +60,7 @@
 			</div>
             
             <div class="custom_select_search">
-                <input type="text" length="15" id="keyword" class="inp">
+                <input type="text" length="15" id="websiteSearch" class="inp">
                 <input type="hidden" class="max_sitename_width" id="max_sitename_width" value="130" />
                 <input type="submit" value="Search" class="but">
 				<img title="Clear" id="reset" style="position: relative; top: 4px; left: -44px; cursor: pointer; display: none;" src="plugins/CoreHome/templates/images/reset_search.png"/>
@@ -72,6 +71,8 @@
 	{literal}<script type="text/javascript">
 $("#sitesSelectionSearch .custom_select_main_link").click(function(){
 	$("#sitesSelectionSearch .custom_select_block").toggleClass("custom_select_block_show");
+	
+		$('#websiteSearch').focus();
 	return false;
 });
     </script>{/literal}
diff --git a/plugins/Dashboard/templates/dashboard.css b/plugins/Dashboard/templates/dashboard.css
index ff22400b63..d0da21038e 100644
--- a/plugins/Dashboard/templates/dashboard.css
+++ b/plugins/Dashboard/templates/dashboard.css
@@ -228,14 +228,6 @@ ol#menuList li, ul#widgetList li .button{
 }
 #addWidget .widget_button .arr{ vertical-align:top; }
 
-.widget input {
-	background: #F7F7FF none repeat scroll 0% 50%;
-	border: 1px solid #B3B3B3;
-	color: #0C183A;
-	font-size: 0.7em;
-	padding: 2px;
-}
-
 #widgetChooser {
 	padding-top:10px;
 }
diff --git a/plugins/ExampleFeedburner/templates/feedburner.tpl b/plugins/ExampleFeedburner/templates/feedburner.tpl
index 0e128a4cb0..064fe5decb 100644
--- a/plugins/ExampleFeedburner/templates/feedburner.tpl
+++ b/plugins/ExampleFeedburner/templates/feedburner.tpl
@@ -63,7 +63,7 @@ $(document).ready(function(){
 </table>
 {/if}
 
-<center>
+<div class='center entityContainer'>
 	<input id="feedburnerName" type="text" value="{$feedburnerFeedName}" />
-	<input id="feedburnerSubmit" type="submit" value="{'General_Ok'|translate}" />
-</center>
+	<input class="submit" id="feedburnerSubmit" type="submit" value="{'General_Ok'|translate}" />
+</div>
diff --git a/plugins/ExamplePlugin/ExamplePlugin.php b/plugins/ExamplePlugin/ExamplePlugin.php
index e0a500d617..793f98d541 100644
--- a/plugins/ExamplePlugin/ExamplePlugin.php
+++ b/plugins/ExamplePlugin/ExamplePlugin.php
@@ -74,8 +74,8 @@ class Piwik_ExamplePlugin_Controller extends Piwik_Controller
 	 */
 	function helloWorld()
 	{
-		echo "Hello world! <br />";
-		echo "Happy coding with Piwik :)";
+		echo "<p>Hello world! <br />";
+		echo "Happy coding with Piwik :)</p>";
 	}
 	
 	/**
@@ -85,11 +85,12 @@ class Piwik_ExamplePlugin_Controller extends Piwik_Controller
 	 */
 	function exampleWidget()
 	{
-		echo "Hello world! <br /> You can output whatever you want in widgets, and put them on dashboard or everywhere on the web (in your blog, website, etc.).
+		echo "<p>Hello world! <br /> You can output whatever you want in widgets, and put them on dashboard or everywhere on the web (in your blog, website, etc.).
 		<br />Widgets can include graphs, tables, flash, text, images, etc.
 		<br />It's very easy to create a new plugin and widgets in Piwik. Have a look at this example file (/plugins/ExamplePlugin/ExamplePlugin.php).
 		<div id='happycoding'><i>Happy coding!</i></div>
 		<div id='jsenabled'>You can easily use Jquery in widgets</div>
+		<p>
 		<script type=\"text/javascript\">$('#happycoding').hide().fadeIn(5000);$('#jsenabled').hide().css({'color':'red'}).fadeIn(10000);</script>";
 	}
 
diff --git a/plugins/Feedback/templates/index.tpl b/plugins/Feedback/templates/index.tpl
index a7a1215862..a4137769a9 100644
--- a/plugins/Feedback/templates/index.tpl
+++ b/plugins/Feedback/templates/index.tpl
@@ -56,7 +56,7 @@ $(function() {
       	<label>{'Feedback_MyMessage'|translate}<br /><i>{'Feedback_DetailsPlease'|translate}</i></label>
         <textarea name="body" cols="57" rows="10"></textarea><br />
       	<label><a href="#" id="feedback-home"><img src="plugins/Feedback/images/go-previous.png" border="0" title="{'General_Previous'|translate}" alt="[{'General_Previous'|translate}]" /></a></label>
-      <input id="feedback-form-submit" class="feedback-submit" type="submit" value="{'Feedback_SendFeedback'|translate}" />
+      <input id="feedback-form-submit" type="submit" class='submit' value="{'Feedback_SendFeedback'|translate}" />
     </form>
   </div>
   <div id="feedback-sent" style="display:none;">
diff --git a/plugins/Feedback/templates/styles.css b/plugins/Feedback/templates/styles.css
index 5a9f9618f6..48eebb4f55 100644
--- a/plugins/Feedback/templates/styles.css
+++ b/plugins/Feedback/templates/styles.css
@@ -1,17 +1,3 @@
-#feedback-form input, #feedback-form textarea, #feedback-sent textarea, #feedback-form select{
-	font-family: Arial, Helvetica, sans-serif;
-	font-size:12px;
-	border:1px solid #d4d4d4;
-	margin:0 0 20px 0;
-	padding:5px 12px;
-	border-radius:2px;
-	-moz-border-radius:2px;
-	-webkit-border-radius:2px;
-	color:#255792;
-	background: url("../../../themes/default/images/inp_bg.png") repeat-x 0 0;
-	
-}
-
 #feedback-faq, #feedback-form, #feedback-sent {
 	font-family: Arial, Helvetica, sans-serif;
 	color:#5e5e5c;
@@ -19,7 +5,6 @@
 	line-height:24px;
 	padding:0px 20px 15px 0;
 }
-
 #feedback-faq strong, #feedback-sent strong {
 	color:#5e5e5c;
 }
@@ -54,20 +39,6 @@
 	padding: 10px;
 }
 
-#feedback-form .feedback-submit{
-	background: #B5B0A7 url("../../../themes/default/images/dashboard_h_bg_hover.png") repeat-x 0 0;
-	color:#fff;
-	border:0;
-	padding:5px 20px;
-	margin:0;
-	border-radius:3px;
-	-moz-border-radius:3px;
-	-webkit-border-radius:3px;
-	cursor:pointer; 
-	display:inline-block; 
-	margin:0;
-}
-
 #feedback-form { font-size:12px; line-height:18px;}
 #feedback-form label{ float:left; width:135px; padding:4px 15px 0 0; text-align:right; position:relative;  }
 #feedback-form label i{ font-style:normal; color:#cbcbcb; }
diff --git a/plugins/Goals/templates/GoalForm.js b/plugins/Goals/templates/GoalForm.js
index bd68ccc25d..3bbb6d80a5 100644
--- a/plugins/Goals/templates/GoalForm.js
+++ b/plugins/Goals/templates/GoalForm.js
@@ -2,9 +2,9 @@
 function showAddNewGoal()
 {
 	hideForms();
-	$("#entityAddContainer").show();
+	$(".entityAddContainer").show();
 	showCancel();
-	piwikHelper.lazyScrollTo("#entityContainer", 400);
+	piwikHelper.lazyScrollTo(".entityContainer", 400);
 	return false;
 }
 
@@ -13,13 +13,13 @@ function showEditGoals()
 	hideForms();
 	$("#entityEditContainer").show();
 	showCancel();
-	piwikHelper.lazyScrollTo("#entityContainer", 400);
+	piwikHelper.lazyScrollTo(".entityContainer", 400);
 	return false;
 }
 
 function hideForms()
 {
-	$("#entityAddContainer").hide();
+	$(".entityAddContainer").hide();
 	$("#entityEditContainer").hide();
 }
 
@@ -97,7 +97,7 @@ function bindGoalForm()
 function getAjaxDeleteGoal(idGoal)
 {
 	var ajaxRequest = piwikHelper.getStandardAjaxConf('goalAjaxLoading');
-	piwikHelper.lazyScrollTo("#entityContainer", 400);
+	piwikHelper.lazyScrollTo(".entityContainer", 400);
 	
 	var parameters = {};
 	parameters.idSite = piwik.idSite;
@@ -113,7 +113,7 @@ function getAjaxDeleteGoal(idGoal)
 function getAjaxAddGoal()
 {
 	var ajaxRequest = piwikHelper.getStandardAjaxConf('goalAjaxLoading');
-	piwikHelper.lazyScrollTo("#entityContainer", 400);
+	piwikHelper.lazyScrollTo(".entityContainer", 400);
 	var parameters = {};
 	
 	parameters.idSite = piwik.idSite;
diff --git a/plugins/Goals/templates/add_edit_goal.tpl b/plugins/Goals/templates/add_edit_goal.tpl
index 52f1dfbbf7..eb6f072d71 100644
--- a/plugins/Goals/templates/add_edit_goal.tpl
+++ b/plugins/Goals/templates/add_edit_goal.tpl
@@ -19,7 +19,7 @@
 {ajaxErrorDiv}
 {ajaxLoadingDiv id=goalAjaxLoading}
 	
-<div id="entityContainer">
+<div class="entityContainer">
 	{if !isset($onlyShowAddNewGoal)}
 		{include file="Goals/templates/list_goal_edit.tpl"}
 	{/if}
diff --git a/plugins/Goals/templates/form_add_goal.tpl b/plugins/Goals/templates/form_add_goal.tpl
index 5435e45f6f..ffb5711506 100644
--- a/plugins/Goals/templates/form_add_goal.tpl
+++ b/plugins/Goals/templates/form_add_goal.tpl
@@ -1,4 +1,4 @@
-<div id='entityAddContainer' style="display:none;">
+<div class='entityAddContainer' style="display:none;">
 <form>
 <table class="dataTable entityTable">
 	<thead>
@@ -68,6 +68,6 @@
 </table>
         <input type="hidden" name="methodGoalAPI" value="" />	
         <input type="hidden" name="goalIdUpdate" value="" />
-        <input type="submit" value="" name="submit" id="goal_submit" class="but_submit" />
+        <input type="submit" value="" name="submit" id="goal_submit" class="submit" />
 </form>
 </div>
diff --git a/plugins/PDFReports/templates/add.tpl b/plugins/PDFReports/templates/add.tpl
index 5a5554a662..3f9daa0f45 100644
--- a/plugins/PDFReports/templates/add.tpl
+++ b/plugins/PDFReports/templates/add.tpl
@@ -1,4 +1,4 @@
-<div id='entityAddContainer' style='display:none'>
+<div class='entityAddContainer' style='display:none'>
 <div class='entityCancel'>
 	{'PDFReports_CancelAndReturnToPDF'|translate:"<a class='entityCancelLink'>":"</a>"}
 </div>
@@ -80,7 +80,7 @@
 	</tbody>
 </table>
 <input type="hidden" id="report_idreport" value="">
-<input type="submit" value="{'PDFReports_CreatePDFReport'|translate}" name="submit" id="report_submit" class="but_submit" />
+<input type="submit" value="{'PDFReports_CreatePDFReport'|translate}" name="submit" id="report_submit" class="submit" />
 </form>
 <div class='entityCancel'>
 	{'General_OrCancel'|translate:"<a class='entityCancelLink'>":"</a>"}
diff --git a/plugins/PDFReports/templates/index.tpl b/plugins/PDFReports/templates/index.tpl
index da763c3c94..57634f41fa 100644
--- a/plugins/PDFReports/templates/index.tpl
+++ b/plugins/PDFReports/templates/index.tpl
@@ -9,7 +9,7 @@
 <div class="centerLargeDiv">
 	<h2>{'PDFReports_ManagePdfReports'|translate}</h2>
 	
-	<div id="entityContainer">
+	<div class="entityContainer">
 		{ajaxErrorDiv}
 		{ajaxLoadingDiv}
 		{include file="PDFReports/templates/list.tpl"}
diff --git a/plugins/PDFReports/templates/pdf.js b/plugins/PDFReports/templates/pdf.js
index 17ac6b818f..c4b1ab5655 100644
--- a/plugins/PDFReports/templates/pdf.js
+++ b/plugins/PDFReports/templates/pdf.js
@@ -32,7 +32,7 @@ function formSetEditReport(idReport)
 function getPDFAjaxRequest(idReport, defaultApiMethod)
 {
 	var parameters = {};
-	piwikHelper.lazyScrollTo("#entityContainer", 400);
+	piwikHelper.lazyScrollTo(".entityContainer", 400);
 	parameters.idSite = piwik.idSite;
 	parameters.module = 'API';
 	parameters.method = defaultApiMethod;
@@ -87,20 +87,20 @@ function initManagePdf()
 	$('a[name=linkEditReport]').click(function(){
 		var idReport = $(this).attr('id');
 		formSetEditReport( idReport );
-		$('#entityAddContainer').show();
+		$('.entityAddContainer').show();
 		$('#entityEditContainer').hide();
 	});	
 	
 	// Add a Report click
 	$('#linkAddReport').click(function(){
-		$('#entityAddContainer').show();
+		$('.entityAddContainer').show();
 		$('#entityEditContainer').hide();
 		formSetEditReport( idReport = 0 );
 	});
 	
 	// Cancel click
 	$('.entityCancelLink').click(function(){
-		$('#entityAddContainer').hide();
+		$('.entityAddContainer').hide();
 		$('#entityEditContainer').show();
 		piwikHelper.hideAjaxError();
 	}).click();
diff --git a/plugins/SEO/templates/index.tpl b/plugins/SEO/templates/index.tpl
index d13ae4f8fb..dbf78cd801 100644
--- a/plugins/SEO/templates/index.tpl
+++ b/plugins/SEO/templates/index.tpl
@@ -6,7 +6,7 @@
 		  {'Installation_SetupWebSiteURL'|translate|ucfirst} 
 		  <input type="text" id="seoUrl" size="40" value="{$urlToRank}" class="textbox" />
 		  <span style="padding-left:2px;"> 
-		  <input type="submit" id ="rankbutton" value="{'SEO_Rank'|translate}" />
+		  <input type="submit" class="submit" id="rankbutton" value="{'SEO_Rank'|translate}" />
 		  </span>
 	  </div>
 	
diff --git a/plugins/SitesManager/Controller.php b/plugins/SitesManager/Controller.php
index d1b8ef3968..874bec4e00 100644
--- a/plugins/SitesManager/Controller.php
+++ b/plugins/SitesManager/Controller.php
@@ -129,7 +129,7 @@ class Piwik_SitesManager_Controller extends Piwik_Controller
 		$pattern = str_replace('%', '', $pattern);
 		if(!count($sites))
 		{
-			$results[] = array('label' => Piwik_Translate('SitesManager_NotFound')."&nbsp;<span style='color: black'>$pattern</span>.", 'id' => '#');
+			$results[] = array('label' => Piwik_Translate('SitesManager_NotFound')."&nbsp;<font class='autocompleteMatched'>$pattern</font>.", 'id' => '#');
 		}
 		else
 		{
@@ -143,7 +143,7 @@ class Piwik_SitesManager_Controller extends Piwik_Controller
 					{
 						foreach ($matches[0] as $match)
 						{
-							$hl_name = str_replace($match, '<span style="color: black">'.$match.'</span>', $s['name']);
+							$hl_name = str_replace($match, '<font class="autocompleteMatched">'.$match.'</font>', $s['name']);
 						}
 					}
 				}
diff --git a/plugins/SitesManager/templates/SitesManager.tpl b/plugins/SitesManager/templates/SitesManager.tpl
index fd9ad00249..801841fb48 100644
--- a/plugins/SitesManager/templates/SitesManager.tpl
+++ b/plugins/SitesManager/templates/SitesManager.tpl
@@ -171,7 +171,9 @@ vertical-align:middle;
 				{$currencyHelpPlain}
 		</td></tr>
 	</table>
-	<span style='margin-left:20px'><input type="submit" class="submit" id='globalSettingsSubmit' value="{'General_Save'|translate}" /></span>
+	<span style='margin-left:20px'>
+		<input type="submit" class="submit" id='globalSettingsSubmit' value="{'General_Save'|translate}" />
+	</span>
 	{ajaxErrorDiv id=ajaxErrorGlobalSettings}
 	{ajaxLoadingDiv id=ajaxLoadingGlobalSettings}
 {/if}
diff --git a/plugins/UsersManager/templates/userSettings.tpl b/plugins/UsersManager/templates/userSettings.tpl
index 887498a1bf..ee30a16908 100644
--- a/plugins/UsersManager/templates/userSettings.tpl
+++ b/plugins/UsersManager/templates/userSettings.tpl
@@ -58,7 +58,7 @@
 	<td><label for="email">{'UsersManager_ChangePassword'|translate} </label></td>
 	<td><input size="25" value="" autocomplete="off" id="password" type="password" />
 	 <span class='form-description'>{'UsersManager_IfYouWouldLikeToChangeThePasswordTypeANewOne'|translate}</span>
-	<br /><input size="25" value="" autocomplete="off" id="passwordBis" type="password" />
+	<br /><br /><input size="25" value="" autocomplete="off" id="passwordBis" type="password" />
 	 <span class='form-description'> {'UsersManager_TypeYourPasswordAgain'|translate}</span>
 	 </td>
 </tr>
@@ -89,7 +89,7 @@
 	{ajaxErrorDiv id=ajaxErrorAnonymousUserSettings}
 	{ajaxLoadingDiv id=ajaxLoadingAnonymousUserSettings}
 
-	<table id='anonymousUserSettingsTable' class="adminTable adminTableNoBorder" style='width:800px'>
+	<table id='anonymousUserSettingsTable' class="adminTable adminTableNoBorder" style='width:850px'>
 	<tr>
 		<td style='width:400px'>{'UsersManager_WhenUsersAreNotLoggedInAndVisitPiwikTheyShouldAccess'|translate}</td>
 		<td>