merge master into navigation

7 files changed, 47 insertions, 33 deletions

diff --git a/core/templates/edit_categories_dialog.php b/core/templates/edit_categories_dialog.php
index 8997fa586bd..d0b7b5ee62a 100644
--- a/core/templates/edit_categories_dialog.php
+++ b/core/templates/edit_categories_dialog.php
@@ -6,11 +6,14 @@ $categories = isset($_['categories'])?$_['categories']:array();
 	<form method="post" id="categoryform">
 	<div class="scrollarea">
 	<ul id="categorylist">
-	<?php foreach($categories as $category) { ?>
+	<?php foreach($categories as $category): ?>
 	<li><input type="checkbox" name="categories[]" value="<?php echo $category; ?>" /><?php echo $category; ?></li>
-	<?php } ?>
+	<?php endforeach; ?>
 	</ul>
 	</div>
-	<div class="bottombuttons"><input type="text" id="category_addinput" name="category" /><button id="category_addbutton" disabled="disabled"><?php echo $l->t('Add'); ?></button></div>
+	<div class="bottombuttons">
+		<input type="text" id="category_addinput" name="category" />
+		<button id="category_addbutton" disabled="disabled"><?php echo $l->t('Add'); ?></button>
+	</div>
 	</form>
 </div>
diff --git a/core/templates/installation.php b/core/templates/installation.php
index 5a3bd2cc9f0..28fbf29b540 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -19,7 +19,7 @@
 	</ul>
 	<?php endif; ?>
 	<?php if(!$_['secureRNG']): ?>
-	<fieldset style="color: #B94A48; background-color: #F2DEDE; border-color: #EED3D7;">
+	<fieldset class="warning">
 		<legend><strong><?php echo $l->t('Security Warning');?></strong></legend>
 		<span><?php echo $l->t('No secure random number generator is available, please enable the PHP OpenSSL extension.');?></span>		
 		<br/>
@@ -27,27 +27,29 @@
 	</fieldset>
 	<?php endif; ?>
 	<?php if(!$_['htaccessWorking']): ?>
-	<fieldset style="color: #B94A48; background-color: #F2DEDE; border-color: #EED3D7;">
+	<fieldset class="warning">
 		<legend><strong><?php echo $l->t('Security Warning');?></strong></legend>
 		<span><?php echo $l->t('Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root.');?></span>		
 	</fieldset>
 	<?php endif; ?>
-	<fieldset>
+	<fieldset id="adminaccount">
 		<legend><?php echo $l->t( 'Create an <strong>admin account</strong>' ); ?></legend>
-		<p class="infield">
-			<label for="adminlogin" class="infield"><?php echo $l->t( 'Username' ); ?></label>
+		<p class="infield grouptop">
 			<input type="text" name="adminlogin" id="adminlogin" value="<?php print OC_Helper::init_var('adminlogin'); ?>" autocomplete="off" autofocus required />
+			<label for="adminlogin" class="infield"><?php echo $l->t( 'Username' ); ?></label>
+			<img class="svg" src="<?php echo image_path('', 'actions/user.svg'); ?>" alt="" />
 		</p>
-		<p class="infield">
-			<label for="adminpass" class="infield"><?php echo $l->t( 'Password' ); ?></label>
+		<p class="infield groupbottom">
 			<input type="password" name="adminpass" id="adminpass" value="<?php print OC_Helper::init_var('adminpass'); ?>" required />
+			<label for="adminpass" class="infield"><?php echo $l->t( 'Password' ); ?></label>
+			<img class="svg" src="<?php echo image_path('', 'actions/password.svg'); ?>" alt="" />
 		</p>
 	</fieldset>
 
 	<fieldset id="datadirField">
 		<legend><a id="showAdvanced"><?php echo $l->t( 'Advanced' ); ?> ▾</a></legend>
 		<div id="datadirContent">
-			<label for="directory"><?php echo $l->t( 'Data folder' ); ?>:</label><br/>
+			<label for="directory"><?php echo $l->t( 'Data folder' ); ?></label>
 			<input type="text" name="directory" id="directory" value="<?php print OC_Helper::init_var('directory', $_['directory']); ?>" />
 		</div>
 	</fieldset>
@@ -73,7 +75,7 @@
 		<p>MySQL <?php echo $l->t( 'will be used' ); ?>.</p>
 		<input type="hidden" id="dbtype" name="dbtype" value="mysql" />
 		<?php else: ?>
-		<input type="radio" name="dbtype" value="mysql" id="mysql" <?php OC_Helper::init_radio('dbtype','mysql', 'sqlite'); ?>/>
+		<input type="radio" name="dbtype" value="mysql" id="mysql" <?php OC_Helper::init_radio('dbtype', 'mysql', 'sqlite'); ?>/>
 		<label class="mysql" for="mysql">MySQL</label>
 		<?php endif; ?>
 		<?php endif; ?>
@@ -84,7 +86,7 @@
 		<input type="hidden" id="dbtype" name="dbtype" value="pgsql" />
 		<?php else: ?>
 		<label class="pgsql" for="pgsql">PostgreSQL</label>
-		<input type="radio" name="dbtype" value='pgsql' id="pgsql" <?php OC_Helper::init_radio('dbtype','pgsql', 'sqlite'); ?>/>
+		<input type="radio" name="dbtype" value='pgsql' id="pgsql" <?php OC_Helper::init_radio('dbtype', 'pgsql', 'sqlite'); ?>/>
 		<?php endif; ?>
 		<?php endif; ?>
 
@@ -94,22 +96,22 @@
 		<input type="hidden" id="dbtype" name="dbtype" value="oci" />
 		<?php else: ?>
 		<label class="oci" for="oci">Oracle</label>
-		<input type="radio" name="dbtype" value='oci' id="oci" <?php OC_Helper::init_radio('dbtype','oci', 'sqlite'); ?>/>
+		<input type="radio" name="dbtype" value='oci' id="oci" <?php OC_Helper::init_radio('dbtype', 'oci', 'sqlite'); ?>/>
 		<?php endif; ?>
 		<?php endif; ?>
 		</div>
 
 		<?php if($hasOtherDB): ?>
 		<div id="use_other_db">
-			<p class="infield">
+			<p class="infield grouptop">
 				<label for="dbuser" class="infield"><?php echo $l->t( 'Database user' ); ?></label>
 				<input type="text" name="dbuser" id="dbuser" value="<?php print OC_Helper::init_var('dbuser'); ?>" autocomplete="off" />
 			</p>
-			<p class="infield">
+			<p class="infield groupmiddle">
 				<label for="dbpass" class="infield"><?php echo $l->t( 'Database password' ); ?></label>
 				<input type="password" name="dbpass" id="dbpass" value="<?php print OC_Helper::init_var('dbpass'); ?>" />
 			</p>
-			<p class="infield">
+			<p class="infield groupmiddle">
 				<label for="dbname" class="infield"><?php echo $l->t( 'Database name' ); ?></label>
 				<input type="text" name="dbname" id="dbname" value="<?php print OC_Helper::init_var('dbname'); ?>" autocomplete="off" pattern="[0-9a-zA-Z$_]+" />
 			</p>
@@ -117,17 +119,17 @@
 		<?php endif; ?>
 		<?php if($_['hasOracle']): ?>
 		<div id="use_oracle_db">
-			<p class="infield">
+			<p class="infield groupmiddle">
 				<label for="dbtablespace" class="infield"><?php echo $l->t( 'Database tablespace' ); ?></label>
 				<input type="text" name="dbtablespace" id="dbtablespace" value="<?php print OC_Helper::init_var('dbtablespace'); ?>" autocomplete="off" />
 			</p>
 		</div>
 		<?php endif; ?>
-		<p class="infield">
-			<label for="dbhost" class="infield"><?php echo $l->t( 'Database host' ); ?></label>
+		<p class="infield groupbottom">
+			<label for="dbhost" class="infield" id="dbhostlabel"><?php echo $l->t( 'Database host' ); ?></label>
 			<input type="text" name="dbhost" id="dbhost" value="<?php print OC_Helper::init_var('dbhost', 'localhost'); ?>" />
 		</p>
 	</fieldset>
 
-	<div class="buttons"><input type="submit" value="<?php echo $l->t( 'Finish setup' ); ?>" /></div>
+	<div class="buttons"><input type="submit" class="primary" value="<?php echo $l->t( 'Finish setup' ); ?>" /></div>
 </form>
diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php
index f78b6ff8bbd..47f4b423b3e 100644
--- a/core/templates/layout.base.php
+++ b/core/templates/layout.base.php
@@ -8,10 +8,10 @@
 			<link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" />
 		<?php endforeach; ?>
 		<script type="text/javascript">
+			var oc_debug = <?php echo (defined('DEBUG') && DEBUG) ? 'true' : 'false'; ?>;
 			var oc_webroot = '<?php echo OC::$WEBROOT; ?>';
 			var oc_appswebroots = <?php echo $_['apps_paths'] ?>;
 			var oc_requesttoken = '<?php echo $_['requesttoken']; ?>';
-			var oc_requestlifespan = '<?php echo $_['requestlifespan']; ?>';
 		</script>
 		<?php foreach ($_['jsfiles'] as $jsfile): ?>
 			<script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index e6468cdcfb4..8395426e4e4 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -8,10 +8,10 @@
 			<link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" />
 		<?php endforeach; ?>
 		<script type="text/javascript">
+			var oc_debug = <?php echo (defined('DEBUG') && DEBUG) ? 'true' : 'false'; ?>;
 			var oc_webroot = '<?php echo OC::$WEBROOT; ?>';
 			var oc_appswebroots = <?php echo $_['apps_paths'] ?>;
 			var oc_requesttoken = '<?php echo $_['requesttoken']; ?>';
-			var oc_requestlifespan = '<?php echo $_['requestlifespan']; ?>';
 			var datepickerFormatDate = <?php echo json_encode($l->l('jsdate', 'jsdate')) ?>;
 			var dayNames = <?php echo json_encode(array((string)$l->t('Sunday'), (string)$l->t('Monday'), (string)$l->t('Tuesday'), (string)$l->t('Wednesday'), (string)$l->t('Thursday'), (string)$l->t('Friday'), (string)$l->t('Saturday'))) ?>;
 			var monthNames = <?php echo json_encode(array((string)$l->t('January'), (string)$l->t('February'), (string)$l->t('March'), (string)$l->t('April'), (string)$l->t('May'), (string)$l->t('June'), (string)$l->t('July'), (string)$l->t('August'), (string)$l->t('September'), (string)$l->t('October'), (string)$l->t('November'), (string)$l->t('December'))) ?>;
@@ -35,7 +35,7 @@
 	<body id="body-login">
 		<div id="login">
 			<header><div id="header">
-				<img src="<?php echo image_path('', 'logo.png'); ?>" alt="ownCloud" />
+				<img src="<?php echo image_path('', 'logo.svg'); ?>" class="svg" alt="ownCloud" />
 			</div></header>
 			<?php echo $_['content']; ?>
 		</div>
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index ddc97d34cc7..8cb49aaf3db 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -8,11 +8,11 @@
 			<link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" />
 		<?php endforeach; ?>
 		<script type="text/javascript">
+			var oc_debug = <?php echo (defined('DEBUG') && DEBUG) ? 'true' : 'false'; ?>;
 			var oc_webroot = '<?php echo OC::$WEBROOT; ?>';
 			var oc_appswebroots = <?php echo $_['apps_paths'] ?>;
 			var oc_current_user = '<?php echo OC_User::getUser() ?>';
 			var oc_requesttoken = '<?php echo $_['requesttoken']; ?>';
-			var oc_requestlifespan = '<?php echo $_['requestlifespan']; ?>';
 			var datepickerFormatDate = <?php echo json_encode($l->l('jsdate', 'jsdate')) ?>;
 			var dayNames = <?php echo json_encode(array((string)$l->t('Sunday'), (string)$l->t('Monday'), (string)$l->t('Tuesday'), (string)$l->t('Wednesday'), (string)$l->t('Thursday'), (string)$l->t('Friday'), (string)$l->t('Saturday'))) ?>;
 			var monthNames = <?php echo json_encode(array((string)$l->t('January'), (string)$l->t('February'), (string)$l->t('March'), (string)$l->t('April'), (string)$l->t('May'), (string)$l->t('June'), (string)$l->t('July'), (string)$l->t('August'), (string)$l->t('September'), (string)$l->t('October'), (string)$l->t('November'), (string)$l->t('December'))) ?>;
@@ -21,6 +21,13 @@
 		<?php foreach($_['jsfiles'] as $jsfile): ?>
 			<script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
 		<?php endforeach; ?>
+		<script type="text/javascript">
+			requesttoken = '<?php echo $_['requesttoken']; ?>';
+			OC.EventSource.requesttoken=requesttoken;
+			$(document).bind('ajaxSend', function(elm, xhr, s) {
+				xhr.setRequestHeader('requesttoken', requesttoken);
+			});
+		</script>
 		<?php foreach($_['headers'] as $header): ?>
 			<?php
 				echo '<'.$header['tag'].' ';
diff --git a/core/templates/login.php b/core/templates/login.php
index 0768b664c6f..153d1b50a30 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -1,7 +1,7 @@
 <!--[if IE 8]><style>input[type="checkbox"]{padding:0;}</style><![endif]-->
 <form method="post">
 	<fieldset>
-		<?php if(!empty($_['redirect'])) { echo '<input type="hidden" name="redirect_url" value="'.$_['redirect'].'" />'; } ?>
+		<?php if(!empty($_['redirect_url'])) { echo '<input type="hidden" name="redirect_url" value="'.$_['redirect_url'].'" />'; } ?>
 		<ul>
 		<?php if(isset($_['invalidcookie']) && ($_['invalidcookie'])): ?>
 			<li class="errors">
@@ -11,20 +11,22 @@
 			</li>
 		<?php endif; ?>
 		<?php if(isset($_['invalidpassword']) && ($_['invalidpassword'])): ?>
-			<a href="./core/lostpassword/"><li class="errors">
+			<a href="<?php echo OC_Helper::linkToRoute('core_lostpassword_index') ?>"><li class="errors">
 				<?php echo $l->t('Lost your password?'); ?>
 			</li></a>
 		<?php endif; ?>
 		</ul>
-		<p class="infield">
-			<label for="user" class="infield"><?php echo $l->t( 'Username' ); ?></label>
+		<p class="infield grouptop">
 			<input type="text" name="user" id="user" value="<?php echo $_['username']; ?>"<?php echo $_['user_autofocus']?' autofocus':''; ?> autocomplete="on" required />
+			<label for="user" class="infield"><?php echo $l->t( 'Username' ); ?></label>
+			<img class="svg" src="<?php echo image_path('', 'actions/user.svg'); ?>" alt="" />
 		</p>
-		<p class="infield">
-			<label for="password" class="infield"><?php echo $l->t( 'Password' ); ?></label>
+		<p class="infield groupbottom">
 			<input type="password" name="password" id="password" value="" required<?php echo $_['user_autofocus']?'':' autofocus'; ?> />
+			<label for="password" class="infield"><?php echo $l->t( 'Password' ); ?></label>
+			<img class="svg" src="<?php echo image_path('', 'actions/password.svg'); ?>" alt="" />
 		</p>
 		<input type="checkbox" name="remember_login" value="1" id="remember_login" /><label for="remember_login"><?php echo $l->t('remember'); ?></label>
-		<input type="submit" id="submit" class="login" value="<?php echo $l->t( 'Log in' ); ?>" />
+		<input type="submit" id="submit" class="login primary" value="<?php echo $l->t( 'Log in' ); ?>" />
 	</fieldset>
 </form>
diff --git a/core/templates/logout.php b/core/templates/logout.php
index 8cbbdd9cc8d..2247ed8e70f 100644
--- a/core/templates/logout.php
+++ b/core/templates/logout.php
@@ -1 +1 @@
-<?php echo $l->t( 'You are logged out.' ); ?>
\ No newline at end of file
+<?php echo $l->t( 'You are logged out.' );