From a2744f39fef498494f10ded95a4dcba80892b73a Mon Sep 17 00:00:00 2001
From: Alex <ddrmoscow@gmail.com>
Date: Fri, 4 Sep 2015 00:34:23 +0300
Subject: [PATCH] ignore .htaccess and config.local files   + cosmetics

---
 .bzrignore                               |  2 ++
 admin/operatorlist.php                   |  4 ++--
 admin/systemsort.php                     |  9 +++++----
 include/limesurvey/admin/login_check.php | 17 ++++++++---------
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/.bzrignore b/.bzrignore
index 7b1ec8ca..b9fb6806 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -1 +1,3 @@
 no vars
+./config.inc.local.php
+./include/limesurvey/.htaccess
diff --git a/admin/operatorlist.php b/admin/operatorlist.php
index 42ee50b2..8a6d95d2 100644
--- a/admin/operatorlist.php
+++ b/admin/operatorlist.php
@@ -402,11 +402,11 @@ if ($display)
 		$titles[] = T_("Win file");//Windows VoIP
 		$titles[] = T_("*nix flle");//*nix VoIP
 	}
-	echo "<div class=' col-sm-10'><div class=' panel-body'>";
+	echo "<div class='col-sm-9'><div class='panel-body'>";
 	xhtml_table($rs,$columns,$titles);
 	echo "</div></div>";
 	
-	echo "<div class='form-group col-sm-2'>
+	echo "<div class='form-group col-sm-3'>
 			<div class='panel-body'><a href='operators.php?add=add' class='btn btn-default btn-block'><i class='fa fa-lg fa-user-plus'></i>&emsp;" . T_("Add an operator") . "</a></div>
 			<div class='panel-body'><a href='extensionstatus.php' class='btn btn-default btn-block'><i class='fa fa-lg fa-whatsapp'></i>&emsp;" . T_("Extensions") . "</a></div>
 			<div class='panel-body'><a href='operatorquestionnaire.php' class='btn btn-default btn-block'><i class='fa fa-lg fa-link'></i>  " . T_("Assign to questionnaire") . "</a></div>
diff --git a/admin/systemsort.php b/admin/systemsort.php
index 412ff0e9..eab597fa 100644
--- a/admin/systemsort.php
+++ b/admin/systemsort.php
@@ -101,13 +101,14 @@ else
 {
 	xhtml_head(T_("Monitor system wide case sorting"),true,array("../include/bootstrap/css/bootstrap.min.css","../css/custom.css"));
 	//print "<h2>" . T_("Monitor system wide case sorting") . "</h2>";
-	print "<p><a href='?watch=watch'>" . T_("Click here to enable and begin system wide case sorting") . "</a></p>";
-	print "<div class='well pull-right col-sm-4'><p>"  . T_("System wide case sorting is periodically (via SYSTEM_SORT_MINUTES configuration directive) sorting cases on a system wide basis instead of finding the most appropriate case each time an operator requests a new case. This may increase performance where there are a large number of cases or complex quotas in place. If you are not experiencing any performance problems, it is not recommended to use this feature.") . "</p></div>";
-	print "<h2>" . T_("Outcome of last process run (if any)") . "</h2>";
+	print "<div class='col-sm-6'></br></br><a href='?watch=watch' class = 'btn btn-danger btn-lg'>" . T_("Click here to enable and begin system wide case sorting") . "</a></div>";
+	print "<div class='well pull-right col-sm-6'><p>"  . T_("System wide case sorting is periodically (via SYSTEM_SORT_MINUTES configuration directive) sorting cases on a system wide basis instead of finding the most appropriate case each time an operator requests a new case. This may increase performance where there are a large number of cases or complex quotas in place. If you are not experiencing any performance problems, it is not recommended to use this feature.") . "</p></div>";
+
 	$d = process_get_last_data(2);
         if ($d !== false)
         {
-                xhtml_table($d,array('process_log_id','datetime','data'),array(T_("Log id"), T_("Date"), T_("Log entry")));
+                	print "<h2>" . T_("Outcome of last process run (if any)") . "</h2>";
+					xhtml_table($d,array('process_log_id','datetime','data'),array(T_("Log id"), T_("Date"), T_("Log entry")));
         }
 }
 xhtml_foot();
diff --git a/include/limesurvey/admin/login_check.php b/include/limesurvey/admin/login_check.php
index 0a621678..f09b6007 100644
--- a/include/limesurvey/admin/login_check.php
+++ b/include/limesurvey/admin/login_check.php
@@ -155,14 +155,13 @@ if(!isset($_SESSION['loginID']) && $action != "forgotpass" && ($action != "logou
         $loginsummary = '
 
 			<form class="form-signin" name="forgotpassword" id="forgotpassword" method="post" action="'.$homeurl.'/admin.php" >
-				<h2>'.$clang->gT('You have to enter user name and email.').'</h2>
+				<h2>'.$clang->gT('You have to enter user name and email.').'</h2><p><br />	<br />
 						<label for="user">'.$clang->gT('Username').'</label><input name="user" id="user" class="form-control" placeholder="User name" required autofocus type="text" size="60" maxlength="60" value="" />
-						<label for="email">'.$clang->gT('Email').'</label><input name="email" id="email" class="form-control" placeholder="Email" required type="text" size="60" maxlength="60" value="" />
+						<label for="email">'.$clang->gT('Email').'</label><input name="email" id="email" class="form-control" placeholder="Email" required type="text" size="60" maxlength="60" value="" /></p>
 						<input type="hidden" name="action" value="forgotpass" />
-						<button class="action btn btn-lg btn-primary btn-block" type="submit">'.$clang->gT('Check Data').'</button>
+						<p><button class="action btn btn-lg btn-primary btn-block" type="submit">'.$clang->gT('Check Data').'</button></p>
 						<p><a href="'.$scriptname.'">'.$clang->gT('Main Admin Screen').'</a></p>
 			</form>
-            <p>&nbsp;</p>
 ';
     }
     elseif (!isset($loginsummary))
@@ -217,11 +216,11 @@ if(!isset($_SESSION['loginID']) && $action != "forgotpass" && ($action != "logou
             }
 
             $loginsummary .= "<label for='user'>".$clang->gT("Username")."</label>
-                                                                            <input class='form-control' placeholder='User name' required autofocus name='user' id='user' type='text' size='40' maxlength='40' value='' />
-                                                                            <label for='password'>".$clang->gT("Password")."</label>
-                                                                            <input name='password' id='password' class='form-control' placeholder='Password' required type='password' size='40' maxlength='40' />
-                                        <label for='loginlang'>".$clang->gT("Language")."</label>
-                                        <select id='loginlang' class='form-control' name='loginlang'>\n";
+                              <input class='form-control' placeholder='User name' required autofocus name='user' id='user' type='text' size='40' maxlength='40' value='' />
+							  <label for='password'>".$clang->gT("Password")."</label>
+                              <input name='password' id='password' class='form-control' placeholder='Password' required type='password' size='40' maxlength='40' />
+                              <label for='loginlang'>".$clang->gT("Language")."</label>
+                              <select id='loginlang' class='form-control' name='loginlang'>\n";
             $loginsummary .='<option value="default" selected="selected">'.$clang->gT('Default').'</option>';
             $lan=array();
             foreach (getlanguagedata(true) as $langkey=>$languagekind)