weiteres backend optimizing

c12fc525 · Wolfgang Wiese · 952aaea4 · c12fc525 · c12fc525 · c12fc525
Commit c12fc525 authored Jun 04, 2020 by Wolfgang Wiese
--- a/README.md
+++ b/README.md
@@ -68,6 +68,9 @@ Die hierin befindlichen Ordner/Dateien sollen in den Git-Ordner
    Custom/Kernel/Output/HTML/Templates/
 kopiert werden.

+OTRS Dokumentation und Defaults siehe: https://github.com/OTRS/otrs/tree/rel-6_0_27/Kernel/Output/HTML/Templates/Standard
+
+
 ## Order Screenshots

 Screenshots, wie die Umsetzung bei richtiger Konfiguration aussehen wird

--- a/Templates/Standard/AgentNavigationBar.tt
+++ b/Templates/Standard/AgentNavigationBar.tt
+# --
+# Copyright (C) 2001-2020 OTRS AG, https://otrs.com/
+# --
+# This software comes with ABSOLUTELY NO WARRANTY. For details, see
+# the enclosed file COPYING for license information (GPL). If you
+# did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt.
+# --
+
+<div id="NavigationContainer">
+    <ul id="Navigation" class="Draggable ARIARoleNavigation" style="visibility: hidden;">
+[% RenderBlockStart("ItemArea") %]
+        <li id="nav-[% Data.NameForID | html %]" class="[% Data.CSS | html %]">
+            <a href="[% Env("Baselink") %][% Data.Link %]" title="[% Translate(Data.Name) | html %][% Data.AccessKeyReference | html %]" accesskey="[% Data.AccessKey | html %]" [% Data.LinkOption %]>[% Translate(Data.Name) | html %]</a>
+[% RenderBlockStart("ItemAreaSub") %]
+            <ul id="nav-[% Data.NameForID | html %]-container">
+[% RenderBlockStart("ItemAreaSubItem") %]
+                <li id="nav-[% Data.NameTop | html %]-[% Data.NameForID | html %]">
+                    <a href="[% Env("Baselink") %][% Data.Link %]" title="[% Translate(Data.Description) | html %][% Data.AccessKeyReference | html %]" accesskey="[% Data.AccessKey | html %]" [% Data.LinkOption %]>[% Translate(Data.Name) | html %]</a>
+                </li>
+[% RenderBlockEnd("ItemAreaSubItem") %]
+            </ul>
+[% RenderBlockEnd("ItemAreaSub") %]
+        </li>
+[% RenderBlockEnd("ItemArea") %]
+[% RenderBlockStart("SearchIcon") %]
+        <li id="nav-search">
+            <a class="Search ScreenXL ARIARoleSearch ARIAHasPopup" id="GlobalSearchNav" href="[% Env("Baselink") %]Action=AgentTicketSearch" title="[% Translate("Search") | html %]">
+                <i class="fa fa-search"></i>
+            </a>
+            <a class="Search SmallerOrEqualScreenL ARIARoleSearch ARIAHasPopup" id="GlobalSearchNavResponsive" href="[% Env("Baselink") %]Action=AgentTicketSearch" title="[% Translate("Search") | html %]">
+                [% Translate("Search") | html %]
+            </a>
+        </li>
+[% RenderBlockEnd("SearchIcon") %]
+    </ul>
+</div>
+
+
+
+    </div> <!-- / #Headerbar -->
+  </header>
\ No newline at end of file
--- a/Templates/Standard/Header.tt
+++ b/Templates/Standard/Header.tt
@@ -11,95 +11,56 @@
 <html>
 [% InsertTemplate("Copyright.tt") %]
 [% InsertTemplate("HTMLHead.tt") %]
-
 <body class="agent [% Data.BodyClass | html %]">
    <a name="Top"></a>
-    <div id="AppWrapper" class="container">
+    <div id="AppWrapper">
+	<header>
+	     <div class="meta-header">
+		<nav class="meta-links" aria-labelledby="meta-links-title">
+		    <h2 id="meta-links-title" class="screen-reader-text">Meta-Navigation</h2>
+		    <ul class="orgalist">
+			<li class="fauhome"><a href="https://www.fau.de"><img src="[% Config("Frontend::WebPath") %]skins/Customer/fau/img/fau-logo-37x16.png" alt="Friedrich-Alexander-Universität Erlangen-Nürnberg (FAU)"></a></li>
+			<li><a href="https://www.rrze.fau.de"><img src="[% Config("Frontend::WebPath") %]skins/Customer/fau/img/rrze-logo-37x16.png" alt="Regionales Rechenzentrum Erlangen (RRZE)"></a></li>
+		    </ul>
+		</nav>
+		<div class="login-info">

-    <header>
-	 <div class="meta-header">
-	    <nav class="meta-links" aria-labelledby="meta-links-title">
-		<h2 id="meta-links-title" class="screen-reader-text">Meta-Navigation</h2>
-		<ul class="orgalist">
-		    <li class="fauhome"><a href="https://www.fau.de"><img src="[% Config("Frontend::WebPath") %]skins/Customer/fau/img/fau-logo-37x16.png" alt="Friedrich-Alexander-Universität Erlangen-Nürnberg (FAU)"></a></li>
-		    <li><a href="https://www.rrze.fau.de"><img src="[% Config("Frontend::WebPath") %]skins/Customer/fau/img/rrze-logo-37x16.png" alt="Regionales Rechenzentrum Erlangen (RRZE)"></a></li>
-		</ul>
-	    </nav>
-	    <div class="login-info">
-		  <span class="logininfo">Angemeldet als <strong>[% Env("UserFullname") | html %]</strong></span>
-		   &mdash;
-			<ul class="itemcounter">
-			[% RenderBlockStart("ToolBarItem") %]
-		       <li class="[% Data.Class | html %]"><a href="[% Data.Link %]" target="[% Data.Target | html %]" accesskey="[% Data.AccessKey | html %]" title="[% Translate(Data.Description) | html %]: [% Data.Count | html %][% Data.AccessKeyReference | html %]">[% Translate(Data.Description) | html %] <i class="icon-small fa fa-clock-o icon-show-reached"></i> <i class="icon-small fa fa-star icon-show-new"></i><i class="[% Data.Icon | html %]"></i> <span class="Counter">[% Data.Count | html %]</span> </a></li>
-			[% RenderBlockEnd("ToolBarItem") %]
+			 <ul class="itemcounter">
+			    [% RenderBlockStart("ToolBarItem") %]
+			    <li class="[% Data.Class | html %]"><a href="[% Data.Link %]" target="[% Data.Target | html %]" accesskey="[% Data.AccessKey | html %]" title="[% Translate(Data.Description) | html %]: [% Data.Count | html %][% Data.AccessKeyReference | html %]"><span class="screen-reader-text">[% Translate(Data.Description) | html %]</span> <i class="icon-small fa fa-clock-o icon-show-reached"></i> <i class="icon-small fa fa-star icon-show-new"></i><i class="[% Data.Icon | html %]"></i> <span class="Counter">[% Data.Count | html %]</span> </a></li>
+			    [% RenderBlockEnd("ToolBarItem") %]
 			</ul>

-			    [% RenderBlockStart("Login") %]
-			       <a class="preferences" href="[% Env("Baselink") %]Action=AgentPreferences" title="[% Translate("Edit personal preferences") | html %]">
-				   <i class="fa fa-cog"></i><span>[% Translate("Personal preferences") | html %]</span>
-			       </a>
-			    [% RenderBlockEnd("Login") %]
-	    		    [% RenderBlockStart("Logout") %]
-			       <a class="logout" id="LogoutButton" href="[% Env("Baselink") %]Action=Logout;[% Env("ChallengeTokenParam") | html %]" title="[% Translate("Logout") | html %] ([% Translate("You are logged in as") | html %] [% Env("UserFullname") | html %])">
-				   <i class="fa fa-power-off"></i><span>[% Translate("Logout") | html %]</span>
-			       </a>
-			   [% RenderBlockEnd("Logout") %]
-	    </div>
-	 </div>
-     </header>
-    <div id="Header" class="ARIARoleBanner">  
-       <p class="logo">
-		    <img src="[% Config("Frontend::WebPath") %]skins/Customer/fau/img/otrs-logo.png" class="otrs-logo" alt="RRZE OTRS">
-		</p>

+			<span class="logininfo">
+			[% IF Data.Avatar %]
+			    <img class="avatar" src="[% Data.Avatar %]" />
+			[% ELSE %]
+			    <span class="notice-login-as">Angemeldet als</span>
+			[% END %]
+			 <strong>[% Env("UserFullname") | html %]</strong></span>


-		<ul id="ToolBar">
-	   [% RenderBlockStart("ToolBar") %]
-		      
+
+			[% RenderBlockStart("Login") %]
+			   <a class="preferences" href="[% Env("Baselink") %]Action=AgentPreferences" title="[% Translate("Edit personal preferences") | html %]">
+			       <i class="fa fa-cog"></i><span>[% Translate("Personal preferences") | html %]</span>
+			   </a>
+			[% RenderBlockEnd("Login") %]
+			[% RenderBlockStart("Logout") %]
+			   <a class="logout" id="LogoutButton" href="[% Env("Baselink") %]Action=Logout;[% Env("ChallengeTokenParam") | html %]" title="[% Translate("Logout") | html %] ([% Translate("You are logged in as") | html %] [% Env("UserFullname") | html %])">
+			       <i class="fa fa-power-off"></i><span>[% Translate("Logout") | html %]</span>
+			   </a>
+		       [% RenderBlockEnd("Logout") %]
+		</div>
+	     </div>
 	 
-	   [% RenderBlockStart("ToolBarSearchProfile") %]
-		       <li class="Extended SearchProfile">
-			   <form action="[% Env("CGIHandle") %]" method="post" name="SearchProfile">
-			       <input type="hidden" name="Action" value="AgentTicketSearch"/>
-			       <input type="hidden" name="Subaction" value="LoadProfile"/>
-			       <input type="hidden" name="SearchTemplate" value="[% Translate("Search") | html %]"/>
-			       [% Data.Link %]
-	   #                    <a href="#" id="ToolbarProfileSearch" title="[% Translate(Data.Description) | html %]  ([% Data.AccessKey | html %])" accesskey="[% Data.AccessKey | html %]" [% Data.LinkOption %]>[% Translate(Data.Name) | html %]</a>
-			   </form>
-		       </li>
-	   [% RenderBlockEnd("ToolBarSearchProfile") %]
-	   [% RenderBlockStart("ToolBarSearchFulltext") %]
-		       <li class="Extended SearchFulltext">
-			   <form action="[% Env("CGIHandle") %]" method="post" name="SearchFulltext">
-			       <input type="hidden" name="Action" value="AgentTicketSearch"/>
-			       <input type="hidden" name="Subaction" value="Search"/>
-			       <input type="hidden" name="SearchTemplate" value="[% Translate("Search") | html %]"/>
-			       <input type="hidden" name="CheckTicketNumberAndRedirect" value="1"/>
-			       [% IF Data.SearchInArchive %]
-				   <input type="hidden" name="SearchInArchive" value="[% Data.SearchInArchive | html %]"/>
-			       [% END %]
-			       <input type="text" size="[% Data.Size | html %]" name="Fulltext" id="Fulltext" value="[% Data.Fulltext | html %]" placeholder="[% Translate(Data.Description) | html %]" title="[% Translate(Data.Description) | html %]"/>
-	   #                    <a href="#" id="ToolbarFulltextSearch" title="[% Translate(Data.Description) | html %] ([% Data.AccessKey | html %])" accesskey="[% Data.AccessKey | html %]" [% Data.LinkOption %]>[% Translate(Data.Name) | html %]</a>
-			   </form>
-		       </li>
-	   [% RenderBlockEnd("ToolBarSearchFulltext") %]
-	   [% RenderBlockStart("ToolBarCICSearchCustomerID") %]
-		       <li class="Extended SearchFulltext">
-			   <input type="text" size="[% Data.Size | html %]" id="ToolBarCICSearchCustomerID" placeholder="[% Translate(Data.Description) | html %]" title="[% Translate(Data.Description) | html %]"/>
-		       </li>
-	   [% RenderBlockEnd("ToolBarCICSearchCustomerID") %]
-	   [% RenderBlockStart("ToolBarCICSearchCustomerUser") %]
-		       <li class="Extended SearchFulltext">
-			   <input type="text" size="[% Data.Size | html %]" id="ToolBarCICSearchCustomerUser" placeholder="[% Translate(Data.Description) | html %]" title="[% Translate(Data.Description) | html %]"/>
-		       </li>
-	   [% RenderBlockEnd("ToolBarCICSearchCustomerUser") %]
-	   [% RenderBlockEnd("ToolBar") %]
-	   [% RenderBlockStart("DebugRTLButton") %]
-		       <li>
-			   <button type="button" class="DebugRTL">Simulate RTL</button>
-		       </li>
-	   [% RenderBlockEnd("DebugRTLButton") %]
-		   </ul>
-    </div>
- 
+	    <div id="Header" class="ARIARoleBanner">
+		 <p class="logo">
+			    <img src="[% Config("Frontend::WebPath") %]skins/Customer/fau/img/otrs-logo.png" class="otrs-logo" alt="RRZE OTRS">
+		</p>
+
+
+
+
+   
\ No newline at end of file
--- a/iotrs/public/css/Custom.RRZE.css
+++ b/iotrs/public/css/Custom.RRZE.css
--- a/iotrs/public/img/login-background.jpg
+++ b/iotrs/public/img/login-background.jpg
--- a/iotrs/public/img/otrs-logo.png
+++ b/iotrs/public/img/otrs-logo.png
--- a/package.json
+++ b/package.json
 {
  "name": "rrze-otrs-customizing",
-  "version": "1.0.7-9",
+  "version": "1.0.7-22",
  "description": "RRZE OTRS UI Customizing",
  "main": "start.html",
  "scripts": {
    "test": "echo \"Error: no test specified\" && exit 1"
  },
-  "logofile": "otrs4.png",
+  "logofile": "otrs7.png",
  "otrs_agentpath": "skins/Customer/fau/",
  "iotrs_path": "iotrs/public/",
  "custom_otrs_cssfilename": "Custom.RRZE.css",
-  "var2loginbackground": "admission-2974645b_1920.jpg",
-  "loginbackground": "support-2355701_1920.jpg",
+  "loginbackground": "admission-2974645b_1920.jpg",
+  "v2loginbackground": "support-2355701_1920.jpg",
  "repository": {
    "type": "git",
    "url": "https://gitlab.rrze.fau.de/rrze-webteam/rrze-otrs-customizing.git"

--- a/skins/Customer/fau/css/Custom.RRZE.css
+++ b/skins/Customer/fau/css/Custom.RRZE.css
@@ -56,6 +56,7 @@ html, body {
  .container footer {
    margin-top: auto;
    width: 100%; }
+  .container .meta-header,
  .container header {
    margin: 0;
    width: 100%;
@@ -335,7 +336,7 @@ body {
  line-height: var(--lineheight);
  font-family: var(--fontfamily); }

-.screen-reader-text {
+.screen-reader-text, .agent .meta-header a.preferences span {
  position: absolute;
  width: 1px;
  height: 1px;
@@ -519,9 +520,45 @@ ul {
  .agent #Header li a {
    color: #003366; }

-.agent .meta-header a span {
-  margin-left: 10px; }
-
-.agent .meta-header a.logout {
-  background-color: #b00f0f;
-  color: white; }
+.agent .meta-header {
+  background: var(--meta-bg-color); }
+  .agent .meta-header .login-info img.avatar {
+    border-radius: 50%;
+    width: 20px;
+    height: 20px;
+    vertical-align: middle;
+    margin: 0 5px; }
+  .agent .meta-header a span {
+    margin-left: 5px; }
+  .agent .meta-header a.logout {
+    background-color: #b00f0f;
+    color: white;
+    margin-left: 20px; }
+  .agent .meta-header ul.itemcounter {
+    display: inline-block; }
+    .agent .meta-header ul.itemcounter i.icon-small {
+      font-size: 12px;
+      position: absolute;
+      right: -7px;
+      text-align: center;
+      top: -3px;
+      width: 15px;
+      display: none; }
+    .agent .meta-header ul.itemcounter li.Locked i.icon-show-locked {
+      display: inline-block; }
+    .agent .meta-header ul.itemcounter li.New i.icon-show-new {
+      display: inline-block; }
+    .agent .meta-header ul.itemcounter li.Reached i.icon-show-reached {
+      display: inline-block; }
+    .agent .meta-header ul.itemcounter li a {
+      padding-right: 0; }
+      .agent .meta-header ul.itemcounter li a span.Counter {
+        display: inline-block;
+        font-size: 12px;
+        line-height: 12px;
+        position: relative;
+        top: 10px;
+        left: -10px; }
+
+.agent #NavigationContainer {
+  position: relative; }
--- a/skins/Customer/fau/img/login-background.jpg
+++ b/skins/Customer/fau/img/login-background.jpg
--- a/skins/Customer/fau/img/otrs-logo.png
+++ b/skins/Customer/fau/img/otrs-logo.png
--- a/src/img/otrs7.png
+++ b/src/img/otrs7.png
--- a/src/sass/_agent.scss
+++ b/src/sass/_agent.scss
@@ -21,6 +21,16 @@
    }
    
    .meta-header {
+	background: var(--meta-bg-color);
+	.login-info {
+	    img.avatar {
+		border-radius: 50%;
+		width: 20px;
+		height: 20px;
+		vertical-align: middle;
+		margin: 0 5px;
+	    }
+	}
 	a {
 	    span {
 		margin-left: 5px;
@@ -28,9 +38,12 @@
 	     &.logout {
 		background-color: #b00f0f;
 		color: white;
+		margin-left: 20px;
 	    }
 	    &.preferences {
-		
+		span {
+		    @extend .screen-reader-text;
+		}
 	    }
 	    
 	}
@@ -39,14 +52,50 @@
 	    
 	    
 	    i.icon-small {
-		    font-size: 12px !important;
+		    font-size: 12px;
 		    position: absolute;
 		    right: -7px;
 		    text-align: center;
 		    top: -3px;
 		    width: 15px;
-		    display: none !important;
-
+		    display: none;
+	    }
+	    
+	    li.Locked {
+		i.icon-show-locked {
+		    display: inline-block;
+		}
+	    }
+	    li.New {
+		i.icon-show-new {
+		    display: inline-block;
+		}
+	    }
+	    li.Reached {
+		i.icon-show-reached {
+		    display: inline-block;
+		}
+	    }
+	    li a {
+		padding-right: 0;
+		
+		span.Counter {
+		    display: inline-block;
+		    font-size: 12px;
+		    line-height: 12px;
+		    position: relative;
+		    top: 10px;
+		    left: -10px;
+		}
+	    }
+	    
+	    
 	}    
    }
+    
+    #NavigationContainer {
+	position: relative;
+	
+    }
+    
 }
\ No newline at end of file
--- a/src/sass/_structure.scss
+++ b/src/sass/_structure.scss
@@ -51,7 +51,7 @@
 	margin-top: auto;
 	width: 100%;
    }
-    
+ 
    header {
 	margin: 0;
 	width: 100%;