Merge pull request #131 from BNoiZe/master

New ticket notification icon

templates/Sparkle/admin/index/index.tpl

@@ -1,15 +1,6 @@
 $header
 	<article>
 	
-	<if 0 < $awaitingtickets && $settings['ticket']['enabled'] == 1 >
-	<div class="messagewrapperfull">
-		<div class="neutralcontainer bradius">
-			<div class="neutraltitle">{$lng['admin']['note']}</div>
-			<div class="neutral">{$awaitingtickets_text}</div>
-		</div>
-	</div>
-	</if>
-
 	<section class="dboarditemfull bradius">
 		<table>
 		<tr>

templates/Sparkle/assets/css/main.css

@@ -88,7 +88,8 @@ ul.topheadernav {
 	font-size: 13px;
 }
 ul.topheadernav li {
-	padding: 0 0 0 50px;
+	padding: 0px;
+	margin-left: 50px;
 	float: left;
 	position: relative;
 }
@@ -103,9 +104,9 @@ ul.topheadernav li a:hover {
 ul.topheadernav li ul {
 	display: none;
 	background-color: #eee;
-	padding: 5px 10px;
+	padding: 5px;
 	box-shadow: 0 1px 3px rgba(0, 0, 0, 0.35);
-	margin-left: -10px;
+	margin-left: 0px;
 	border-radius: 3px;
 }
 ul.topheadernav li:hover ul {
@@ -114,7 +115,7 @@ ul.topheadernav li:hover ul {
 }
 ul.topheadernav li ul li {
 	font-size: 11px;
-	margin-left: -50px;
+	margin-left: 0px;
 }
 ul.topheadernav li ul li a:hover {
 	color: #111;
@@ -129,6 +130,24 @@ nav div:first-child {
 	display: none;
 }
 
+.topheadernav img {
+	padding: 0px;
+	margin: 0px;
+}
+.countbubble {
+	display: block;
+	font-size: 9px;
+	color: #fff;
+	background-color: #dd0000;
+	position: absolute;
+	padding: 3px;
+	font-weight: bold;
+	line-height: 9px;
+	border-radius: 3px;
+	right: -6px;
+	bottom: -3px;
+}
+
 /* FOOTER */
 footer {
 	clear:both;
@@ -478,7 +497,7 @@ a:hover {
 .main {
 	margin-left:240px;
 	margin-right:10px;
-	margin-top:65px;
+	margin-top:64px;
 	margin-bottom:0;
 	background-color:#fff;
 	padding: 30px 30px 30px 30px;

templates/Sparkle/customer/index/index.tpl

@@ -1,15 +1,6 @@
 $header
 	<article>
 
-	<if 0 < $awaitingtickets && $settings['ticket']['enabled'] == 1 >
-	<div class="messagewrapperfull">
-		<div class="warningcontainer bradius">
-			<div class="warningtitle">{$lng['admin']['warning']}</div>
-			<div class="warning"><br /><strong>{$awaitingtickets_text}</strong></div>
-		</div>
-	</div>
-	</if>
-
 	<section class="dboarditem bradius">
 	<table>
 	<tr>

templates/Sparkle/header.tpl

@@ -44,6 +44,18 @@
 	<img src="{$header_logo}" alt="Froxlor Server Management Panel" class="small" />
 	<div class="topheader_navigation">
 		<ul class="topheadernav">
+			<if $settings['ticket']['enabled'] == 1>
+				<li>
+					<a href="{$linker->getLink(array('section' => 'tickets', 'page' => 'tickets'))}">
+						<if 0 < $awaitingtickets>
+							<img src="templates/{$theme}/assets/img/icons/menubar_tickets.png" alt="{$lng['menue']['ticket']['ticket']}" />
+							<span class="countbubble">{$awaitingtickets}</span>
+						<else>
+							<img src="templates/{$theme}/assets/img/icons/menubar_tickets_null.png" alt="{$lng['menue']['ticket']['ticket']}" />
+						</if>
+					</a>
+				</li>
+			</if>
 			<li>{$userinfo['loginname']}</li>
 			<li><a href="{$linker->getLink(array('section' => 'index'))}">{$lng['admin']['overview']}</a></li>
 			<li><a href="#">{$lng['panel']['options']}&nbsp;&#x25BE;</a>