From e27a4092871482fcaffef5672d5623f2f9f9e881 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Fri, 16 May 2014 17:11:51 +0200
Subject: [PATCH] show appname next to logo for better hint at navigation

---
 core/css/header.css            | 34 ++++++++++++++++++++++++++--------
 core/css/mobile.css            |  5 +++++
 core/css/styles.css            |  3 +++
 core/templates/layout.user.php |  4 ++++
 4 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/core/css/header.css b/core/css/header.css
index 65afdf5570..4548903832 100644
--- a/core/css/header.css
+++ b/core/css/header.css
@@ -1,16 +1,34 @@
+/* display logo so appname can be shown next to it */
+#header .logo-wide {
+	display: inline-block;
+}
+/* show appname next to logo */
+.header-appname {
+	display: inline-block;
+	position: relative;
+	color: #fff;
+	font-size: 26px;
+	opacity: .4;
+	margin-left: 5px;
+}
 /* show caret indicator next to logo to make clear it is tappable */
-#owncloud.menutoggle {
-	background-image: url('../img/actions/caret.svg');
-	background-repeat: no-repeat;
-	background-position: right 26px;
-	padding-right: 16px !important;
+#header .icon-caret {
+	display: inline-block;
+	width: 12px;
+	height: 14px;
+}
+.header-appname,
+#header .icon-caret {
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=45)";
+	filter: alpha(opacity=45);
+	opacity: .45;
 }
 /* do not show menu toggle on public share links as there is no menu */
-#body-public #owncloud.menutoggle {
-	background-image: none;
-	padding-right: 0 !important;
+#body-public #header .icon-caret {
+	display: none;
 }
 
+
 /* toggle navigation */
 #content-wrapper {
 	padding-left: 0;
diff --git a/core/css/mobile.css b/core/css/mobile.css
index 9cea0dddc8..49bc6a2195 100644
--- a/core/css/mobile.css
+++ b/core/css/mobile.css
@@ -4,6 +4,11 @@
 	padding-top: 10px;
 }
 
+/* don’t show appname next to logo on narrow screens */
+.header-appname {
+	display: none;
+}
+
 #body-login .wrapper {
 	display: -webkit-box;
 	-webkit-box-orient: horizontal;
diff --git a/core/css/styles.css b/core/css/styles.css
index 595b553267..9b70d6fe09 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -59,6 +59,9 @@ body {
 	left: 0;
 	padding: 6px;
 	padding-bottom: 0;
+	height: 45px; /* header height */
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
 }
 
 /* info part on the right, used e.g. for info on who shared something */
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index d551c53521..891221227c 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -47,6 +47,10 @@
 	<header><div id="header">
 			<a href="<?php print_unescaped(link_to('', 'index.php')); ?>" title="" id="owncloud">
 				<div class="logo-wide svg"></div>
+				<div class="header-appname">
+					<?php p(!empty($_['application'])?$_['application']:''); ?>
+				</div>
+				<div class="icon-caret"></div>
 			</a>
 			<div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div>
 			<div id="settings" class="svg">