Genesys UX 2016 (contents pages)

40d72331 · Matija Obreza · 8cdcac5d · 40d72331 · 40d72331 · 40d72331
Commit 40d72331 authored May 31, 2016 by Matija Obreza
10 changed files
--- a/src/main/sourceapp/1/images/ICON-LINKEDIN-A.svg
+++ b/src/main/sourceapp/1/images/ICON-LINKEDIN-A.svg
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 24.2 24.2" style="enable-background:new 0 0 24.2 24.2;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#015E91;}
+</style>
+<path class="st0" d="M12.1,0.1C5.4,0.1,0,5.5,0,12.1c0,6.7,5.4,12.1,12.1,12.1c6.7,0,12.1-5.4,12.1-12.1C24.1,5.5,18.7,0.1,12.1,0.1
+	z M8.6,17.4H5.7l0-8.7h2.9V17.4z M8.6,6.4c0,0.8-0.7,1.4-1.5,1.5h0c-0.8,0-1.5-0.6-1.5-1.5V6.4c0-0.8,0.6-1.5,1.4-1.5h0
+	C7.9,4.9,8.6,5.5,8.6,6.4L8.6,6.4z M18.5,17.4l-3,0v-5.8c0-0.2-0.4-0.8-1.2-0.8h0c-0.9,0-1.3,0.6-1.3,0.8v5.8l-2.9,0V8.8h2.9v0.9
+	c0.1-0.1,0.8-0.9,2.7-0.9c2.5,0,2.8,1.7,2.9,2.6V17.4z"/>
+</svg>
--- a/src/main/sourceapp/1/images/ICON-LINKEDIN-N.svg
+++ b/src/main/sourceapp/1/images/ICON-LINKEDIN-N.svg
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 24.2 24.2" style="enable-background:new 0 0 24.2 24.2;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#036EB5;}
+</style>
+<path class="st0" d="M12.1,0.1C5.4,0.1,0,5.5,0,12.1c0,6.7,5.4,12.1,12.1,12.1c6.7,0,12.1-5.4,12.1-12.1C24.1,5.5,18.7,0.1,12.1,0.1
+	z M8.6,17.4H5.7l0-8.7h2.9V17.4z M8.6,6.4c0,0.8-0.7,1.4-1.5,1.5h0c-0.8,0-1.5-0.6-1.5-1.5V6.4c0-0.8,0.6-1.5,1.4-1.5h0
+	C7.9,4.9,8.6,5.5,8.6,6.4L8.6,6.4z M18.5,17.4l-3,0v-5.8c0-0.2-0.4-0.8-1.2-0.8h0c-0.9,0-1.3,0.6-1.3,0.8v5.8l-2.9,0V8.8h2.9v0.9
+	c0.1-0.1,0.8-0.9,2.7-0.9c2.5,0,2.8,1.7,2.9,2.6V17.4z"/>
+</svg>
--- a/src/main/sourceapp/1/images/ICON-TWITTER-A.svg
+++ b/src/main/sourceapp/1/images/ICON-TWITTER-A.svg
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 24.2 24.2" style="enable-background:new 0 0 24.2 24.2;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#005D91;}
+</style>
+<path class="st0" d="M12.1,0C5.4,0,0,5.4,0,12.1s5.4,12.1,12.1,12.1s12.1-5.4,12.1-12.1S18.8,0,12.1,0z M16.5,9.8c0,0.1,0,0.2,0,0.3
+	c0,3-2.3,6.5-6.5,6.5c-1.3,0-2.5-0.4-3.5-1c0.2,0,0.4,0,0.5,0c1.1,0,2.1-0.4,2.9-1c-1,0-1.9-0.7-2.1-1.6c0.1,0,0.3,0,0.4,0
+	c0.2,0,0.4,0,0.6-0.1c-1.1-0.2-1.8-1.1-1.8-2.3c0,0,0,0,0,0C7.3,10.9,7.6,11,8,11c-0.6-0.4-1-1.1-1-1.9C7,8.7,7.1,8.3,7.3,8
+	c1.1,1.4,2.8,2.3,4.7,2.4c0-0.2-0.1-0.3-0.1-0.5c0-1.3,1-2.3,2.3-2.3c0.7,0,1.3,0.3,1.7,0.7c0.5-0.1,1-0.3,1.5-0.6
+	c-0.2,0.5-0.5,1-1,1.3c0.5-0.1,0.9-0.2,1.3-0.4C17.4,9.1,17,9.5,16.5,9.8z"/>
+</svg>
--- a/src/main/sourceapp/1/images/ICON-TWITTER-N.svg
+++ b/src/main/sourceapp/1/images/ICON-TWITTER-N.svg
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 24.2 24.2" style="enable-background:new 0 0 24.2 24.2;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#036EB5;}
+</style>
+<path class="st0" d="M12.1,0C5.4,0,0,5.4,0,12.1s5.4,12.1,12.1,12.1s12.1-5.4,12.1-12.1S18.8,0,12.1,0z M16.5,9.8c0,0.1,0,0.2,0,0.3
+	c0,3-2.3,6.5-6.5,6.5c-1.3,0-2.5-0.4-3.5-1c0.2,0,0.4,0,0.5,0c1.1,0,2.1-0.4,2.9-1c-1,0-1.9-0.7-2.1-1.6c0.1,0,0.3,0,0.4,0
+	c0.2,0,0.4,0,0.6-0.1c-1.1-0.2-1.8-1.1-1.8-2.3c0,0,0,0,0,0C7.3,10.9,7.6,11,8,11c-0.6-0.4-1-1.1-1-1.9C7,8.7,7.1,8.3,7.3,8
+	c1.1,1.4,2.8,2.3,4.7,2.4c0-0.2-0.1-0.3-0.1-0.5c0-1.3,1-2.3,2.3-2.3c0.7,0,1.3,0.3,1.7,0.7c0.5-0.1,1-0.3,1.5-0.6
+	c-0.2,0.5-0.5,1-1,1.3c0.5-0.1,0.9-0.2,1.3-0.4C17.4,9.1,17,9.5,16.5,9.8z"/>
+</svg>
--- a/src/main/sourceapp/1/images/about-banner-mobile.png
+++ b/src/main/sourceapp/1/images/about-banner-mobile.png
--- a/src/main/sourceapp/1/images/about-banner-tablet.png
+++ b/src/main/sourceapp/1/images/about-banner-tablet.png
--- a/src/main/sourceapp/1/images/about-banner.png
+++ b/src/main/sourceapp/1/images/about-banner.png
--- a/src/main/sourceapp/1/styles/genesys.scss
+++ b/src/main/sourceapp/1/styles/genesys.scss
--- a/src/main/webapp/WEB-INF/jsp/1/content/article.jsp
+++ b/src/main/webapp/WEB-INF/jsp/1/content/article.jsp
@@ -7,43 +7,42 @@
    <title>${title}</title>
    <local:content-headers description="${jspHelper.htmlToText(article.summary, 150)}" title="${title}"/>
 </head>
-<body>
+<body class="about-page">
 <content tag="header">
-    <div class="hidden-xs top-image">
-        <img src="<c:url value="/html/0/images/aim/banner-${jspHelper.randomInt(1, 4)}.jpg" />" title="${title}"/>
-    </div>
-    <div class="">
-        <div class="banner-<c:out value="${article.slug}" />"></div>
-        <c:if test="${title ne ''}">
-            <div class="">
-                <security:authorize access="hasRole('ADMINISTRATOR') or hasRole('CONTENTMANAGER')">
-                    <form class="inline-form pull-right" method="post" action="<c:url value="/content/transifex"/>">
-                        <input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>
-                        <input id="articleSlug" type="hidden" name="slug" value="${article.slug eq "blurp"? "".concat(article.classPk.shortName).concat("-").concat(article.targetId) : article.slug}"/>
-
-                        <c:choose>
-                            <c:when test="${article.targetId ne null}">
-                                <a class="btn btn-default" href="<c:url value="/content/edit/${article.slug}/${article.classPk.shortName}/${article.targetId}/${article.lang}" />"><spring:message
-                                        code="edit"/></a>
-                            </c:when>
-                            <c:otherwise>
-                                <a class="btn btn-default" href="<c:url value="/content/edit/${article.slug}/${article.lang}" />"><spring:message
-                                        code="edit"/></a>
-                            </c:otherwise>
-                        </c:choose>
-
-                        <input type="submit" name="fetch-all" class="btn btn-default"
-                               value="<spring:message code="article.fetch-from-transifex" />"/>
-                    </form>
-                </security:authorize>
-            </div>
-        </c:if>
-    </div>
+	<div class="top-image">
+	</div>
+	<c:if test="${article.id ne null}">
+  <security:authorize access="hasRole('ADMINISTRATOR') or hasRole('CONTENTMANAGER')">
+  	<div style="position: relative;">
+  	<div class="" style="position: absolute; right: 0;">
+		        <form class="inline-form pull-right" method="post" action="<c:url value="/content/transifex"/>">
+		            <input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>
+		            <input id="articleSlug" type="hidden" name="slug" value="${article.slug eq "blurp"? "".concat(article.classPk.shortName).concat("-").concat(article.targetId) : article.slug}"/>
+		
+		            <c:choose>
+		                <c:when test="${article.targetId ne null}">
+		                    <a class="btn btn-default" href="<c:url value="/content/edit/${article.slug}/${article.classPk.shortName}/${article.targetId}/${article.lang}" />"><spring:message
+		                            code="edit"/></a>
+		                </c:when>
+		                <c:otherwise>
+		                    <a class="btn btn-default" href="<c:url value="/content/edit/${article.slug}/${article.lang}" />"><spring:message
+		                            code="edit"/></a>
+		                </c:otherwise>
+		            </c:choose>
+		
+		            <input type="submit" name="fetch-all" class="btn btn-default"
+		                   value="<spring:message code="article.fetch-from-transifex" />"/>
+		        </form>
+		</div>
+		</div>
+  </security:authorize>
+	</c:if>
 </content>

-<h1>
-	<c:out value="${title}" escapeXml="false"/>
-</h1>
+<div class="row">
+	<h1 class="green-bg">
+		<c:out value="${title}" escapeXml="false"/>
+	</h1>

 <c:if test="${article.lang != pageContext.response.locale.language}">
    <%@include file="/WEB-INF/jsp/not-translated.jsp" %>
@@ -51,8 +50,8 @@

 <%@include file="/WEB-INF/jsp/content/transifex-responses.jsp" %>

-<div class="article">
-    <div class="right-side main-col col-md-9">
+<div class="article clearfix">
+    <div class="right-side main-col">

        <div class="free-text" dir="${article.lang=='fa' || article.lang=='ar' ? 'rtl' : 'ltr'}">
            <c:out value="${article.body}" escapeXml="false"/>

--- a/src/main/webapp/WEB-INF/jsp/1/content/ascii-doc.jsp
+++ b/src/main/webapp/WEB-INF/jsp/1/content/ascii-doc.jsp
@@ -7,19 +7,20 @@
  <c:out value="${head}" escapeXml="false" />
  <title>${title}</title>
 </head>
-<body>
+<body class="about-page">
 <content tag="header">
-  <div class="hidden-xs top-image">
-    <img src="<c:url value="/html/0/images/aim/banner-${jspHelper.randomInt(1, 4)}.jpg" />" title="${title}"/>
+  <div class="top-image">
+    <%-- <img src="<c:url value="/html/0/images/aim/banner-${jspHelper.randomInt(1, 4)}.jpg" />" title="${title}"/> --%>
  </div>
 </content>

-<h1>
-  <c:out value="${title}" escapeXml="false"/>
-</h1>
+<div class="row">
+	<h1 class="green-bg">
+	  <c:out value="${title}" escapeXml="false"/>
+	</h1>

-<div class="article">
-  <div class="right-side main-col col-md-9">
+<div class="article clearfix">
+  <div class="right-side main-col">
    <div class="free-text">
      <c:out value="${bodyHeader}" escapeXml="false"/>
      <c:out value="${bodyContent}" escapeXml="false"/>
@@ -27,7 +28,7 @@
    </div>
  </div>

-  <div class="col-md-3 col-xs-12">
+  <div class="col-md-3 sidebar-nav col-xs-12">
    <c:out value="${menu}" escapeXml="false"/>
  </div>
 </div>