Commit 2f4ab8d8 authored by Ludovic Dubost's avatar Ludovic Dubost
Browse files

Added Menu in header and Footer with social media buttons

parent 6926ac03
......@@ -24,7 +24,7 @@
<web>PublicWebSite.Code</web>
<name>BlockColumnsMacro</name>
<language/>
<defaultLanguage/>
<defaultLanguage>en</defaultLanguage>
<translation>0</translation>
<creator>xwiki:XWiki.Admin</creator>
<creationDate>1514761200000</creationDate>
......@@ -199,11 +199,21 @@
height: 100%;
}
.row-eq-height {
.row-eq-height {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
}
/* Resetting rules for mobile view */
@media (max-width: @screen-xs-max) {
.row-eq-height {
display: block;
.shadow-column {
margin-bottom: 10px;
}
}
}</code>
</property>
<property>
......
......@@ -24,7 +24,7 @@
<web>PublicWebSite.Code</web>
<name>BlockHeaderMacro</name>
<language/>
<defaultLanguage/>
<defaultLanguage>en</defaultLanguage>
<translation>0</translation>
<creator>xwiki:XWiki.Admin</creator>
<creationDate>1514761200000</creationDate>
......
......@@ -24,7 +24,7 @@
<web>PublicWebSite.Code</web>
<name>BlockLogosMacro</name>
<language/>
<defaultLanguage/>
<defaultLanguage>en</defaultLanguage>
<translation>0</translation>
<creator>xwiki:XWiki.Admin</creator>
<creationDate>1514761200000</creationDate>
......@@ -179,13 +179,14 @@
.v-center-item {
display: flex;
align-items: center;
min-height: 150px;
}
.blocklogos img {
width: 70%;
}
.center-block {
display: block;
display: inline-block;
margin-left: auto;
margin-right: auto;
vertical-align: middle;
......@@ -380,7 +381,7 @@
#set($cols="col-xs-4 col-sm-2")
#end
#foreach($image in $images)
&lt;div class="col-xs-4 col-sm-${colNb} v-center-item"&gt;
&lt;div class="${cols} v-center-item"&gt;
#set($imageParams = "")
#set($pos = $image.indexOf("||"))
#if($pos!=-1)
......
......@@ -24,7 +24,7 @@
<web>PublicWebSite.Code</web>
<name>BlockTestimonialMacro</name>
<language/>
<defaultLanguage/>
<defaultLanguage>en</defaultLanguage>
<translation>0</translation>
<creator>xwiki:XWiki.Admin</creator>
<creationDate>1514761200000</creationDate>
......
......@@ -24,7 +24,7 @@
<web>PublicWebSite.Code</web>
<name>BlockTextMacro</name>
<language/>
<defaultLanguage/>
<defaultLanguage>en</defaultLanguage>
<translation>0</translation>
<creator>xwiki:XWiki.Admin</creator>
<creationDate>1514761200000</creationDate>
......
This diff is collapsed.
<?xml version="1.0" encoding="UTF-8"?>
<!--
* See the NOTICE file distributed with this work for additional
* information regarding copyright ownership.
*
* This is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
*
* This software is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this software; if not, write to the Free
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
<xwikidoc version="1.3" reference="PublicWebSite.Code.MediaShareClass" locale="">
<web>PublicWebSite.Code</web>
<name>MediaShareClass</name>
<language/>
<defaultLanguage/>
<translation>0</translation>
<creator>xwiki:XWiki.Admin</creator>
<creationDate>1514761200000</creationDate>
<parent>en:PublicWebSite.Code.WebHome</parent>
<author>xwiki:XWiki.Admin</author>
<contentAuthor>xwiki:XWiki.Admin</contentAuthor>
<date>1514761200000</date>
<contentUpdateDate>1514761200000</contentUpdateDate>
<version>1.1</version>
<title/>
<comment/>
<minorEdit>false</minorEdit>
<syntaxId>xwiki/2.1</syntaxId>
<hidden>true</hidden>
<content/>
<class>
<name>PublicWebSite.Code.MediaShareClass</name>
<customClass/>
<customMapping/>
<defaultViewSheet/>
<defaultEditSheet/>
<defaultWeb/>
<nameField/>
<validationScript/>
<docTitle>
<customDisplay/>
<disabled>0</disabled>
<name>docTitle</name>
<number>1</number>
<picker>0</picker>
<prettyName>Title</prettyName>
<size>30</size>
<unmodifiable>0</unmodifiable>
<validationMessage/>
<validationRegExp/>
<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
</docTitle>
<hashtag>
<customDisplay/>
<disabled>0</disabled>
<name>hashtag</name>
<number>2</number>
<picker>0</picker>
<prettyName>Hashtag</prettyName>
<size>30</size>
<unmodifiable>0</unmodifiable>
<validationMessage/>
<validationRegExp/>
<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
</hashtag>
<image>
<customDisplay/>
<disabled>0</disabled>
<name>image</name>
<number>5</number>
<picker>0</picker>
<prettyName>Image</prettyName>
<size>30</size>
<unmodifiable>0</unmodifiable>
<validationMessage/>
<validationRegExp/>
<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
</image>
<text>
<contenttype>---</contenttype>
<customDisplay/>
<disabled>0</disabled>
<editor>---</editor>
<name>text</name>
<number>3</number>
<picker>0</picker>
<prettyName>Text</prettyName>
<rows>5</rows>
<size>40</size>
<unmodifiable>0</unmodifiable>
<validationMessage/>
<validationRegExp/>
<classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
</text>
</class>
</xwikidoc>
......@@ -78,18 +78,17 @@
<property>
<content>#set($displayDocExtra = false)
#set($displayContentFooter = false)
#set($displayContentMenu = $hasAdmin &amp;&amp; $isAdvancedUser)
#set($displayBreadcrumbs = $hasAdmin &amp;&amp; $isAdvancedUser)
#set($displayContentMenu = !$isGuest)
#set($displayBreadcrumbs = true)
#set($displayDrawer = $hasAdmin &amp;&amp; $isAdvancedUser)
#set($displayQuickSearch = ($doc.fullName != 'Main.WebHome'))
#set($displayQuickSearch = true)
#set($hideNavigationTree = true)
#set($displayDocChanges = false)
#set($displaySocialMediaButton = true)
#* These will be handled from the pages *#
#set($displayDocTitle = true)
#set($displayTitleContentSeparator = true)
#set($extraFooterTemplate = 'footer_demarches.vm')</content>
#set($displayTitleContentSeparator = true)</content>
</property>
<property>
<path>layoutExtraVars.vm</path>
......@@ -147,7 +146,8 @@
##
## Default mode: display the hierarchy for the current page
##
#hierarchy($NULL {'id': 'hierarchy', 'limit': 5, 'treeNavigation': true})
#set($displayNavigationTree = !$hideNavigationTree)
#hierarchy($NULL {'id': 'hierarchy', 'limit': 5, 'treeNavigation': $displayNavigationTree })
#end
&lt;/div&gt;&lt;/div&gt;
#end</content>
......@@ -271,8 +271,8 @@
</path>
</class>
<property>
<content>#if($displayDocTitle)
&lt;div class="row document-header"&gt;
<content>&lt;div class="row document-header #if(!$displayDocTitle)publicwebsite-document-header#end"&gt;
#if($displayDocTitle)
&lt;div class="document-info col-xs-12 #if($displayContentMenu)col-md-7#end"&gt;
## --------------------------------------------------------
## Display UI Extensions before the title element
......@@ -296,6 +296,7 @@
&lt;/div&gt;
#end
&lt;/div&gt;
#end
#if($displayContentMenu)
&lt;div class="document-menu col-xs-12 col-md-5"&gt;
#template("menus_content.vm")
......@@ -304,7 +305,6 @@
&lt;/div&gt;
#if($displayTitleContentSeparator)
&lt;hr/&gt;
#end
#end</content>
</property>
<property>
......@@ -348,30 +348,37 @@
</class>
<property>
<content>#if($isInServletMode)## Visible only in a page
#if("$!extraFooterTemplate" != '')
#template($extraFooterTemplate)
#end
&lt;div id="footerglobal"&gt;
## --------------------------------------------------------
## Display UI Extensions before the title element
## --------------------------------------------------------
#foreach ($uix in $services.uix.getExtensions('org.xwiki.platform.template.footer.before'))
$services.rendering.render($uix.execute(), 'xhtml/1.0')
#end
#if($displayLicence)
&lt;div id="xwikilicence"&gt;$!copyright&lt;/div&gt;
#set ($version = $xwiki.getSpacePreference('version'))
#if ("$!version" == "")
#set ($version = $xwiki.getXWikiPreference("version"))
#end
#if ("$!version" != "")
## The version information coming from preferences is usually Velocity code, so make sure to evaluate it.
&lt;div id="xwikiplatformversion"&gt;#evaluate($version)&lt;/div&gt;
#else
&lt;div id="xwikiplatformversion"&gt;
#set($productURL = $services.extension.core.repository.environmentExtension.website)
#if ($productURL)
&lt;a href="$services.extension.core.repository.environmentExtension.website"&gt;
#end
#if($displayVersion)
#set ($version = $xwiki.getSpacePreference('version'))
#if ("$!version" == "")
#set ($version = $xwiki.getXWikiPreference("version"))
#end
#if ("$!version" != "")
## The version information coming from preferences is usually Velocity code, so make sure to evaluate it.
&lt;div id="xwikiplatformversion"&gt;#evaluate($version)&lt;/div&gt;
#else
&lt;div id="xwikiplatformversion"&gt;
#set($productURL = $services.extension.core.repository.environmentExtension.website)
#if ($productURL)
&lt;a href="$services.extension.core.repository.environmentExtension.website"&gt;
#end
$services.extension.core.repository.environmentExtension.name $xwiki.getVersion()
#if ($productURL)
&lt;/a&gt;
#end
&lt;/div&gt;
#end
#if ($productURL)
&lt;/a&gt;
#end
&lt;/div&gt;
#end
#end
&lt;/div&gt;
#end
### TODO: Format the footer for pdf output</content>
......
......@@ -24,7 +24,7 @@
<web>PublicWebSite.Code</web>
<name>TotemSSX</name>
<language/>
<defaultLanguage/>
<defaultLanguage>fr</defaultLanguage>
<translation>0</translation>
<creator>xwiki:XWiki.Admin</creator>
<creationDate>1514761200000</creationDate>
......@@ -151,7 +151,7 @@ This allows any row in the content of the document to start at the leftmost of t
/* Move document header bottom margin inside the document header row - as bottom padding, and remove xcontent top margin */
.document-header {
margin-bottom:0;
padding-bottom: 20px;
padding-bottom: 0px;
}
#mainContentArea &gt; .xcontent {
......@@ -178,6 +178,37 @@ This allows any row in the content of the document to start at the leftmost of t
margin-top: -20px;
}
/*
* Cleanup box shadows which make it difficult to visually unify consecutive rows - esp main menu and title row
*/
#mainContentArea, #xdocFooter, #docextrapanes {
box-shadow: none;
}
/*
Clean up spacing between header and title / hierarchy / content rows - reset everything to 0
*/
#mainContentArea {
padding-top: 0px;
}
#hierarchy {
margin-bottom: 0;
}
.hierarchy-row {
margin-top: 0;
}
.document-header {
margin-top: 0;
}
.document-header #document-title h1 {
margin-bottom: 0;
}
/* At this point, we have a nice nice stack of rows in #mainContentArea (xcontent), as follows:
- document header row
- document content row - which contains the xwikicontent column which contains all the rows in the document content.
......@@ -185,7 +216,19 @@ This allows any row in the content of the document to start at the leftmost of t
Visually, there's the title row and then all the rows from the document content, stacked.
*/
/**/</code>
/**/
.publicwebsite-document-header .document-menu {
position: absolute;
z-index: 1;
right: 0;
margin-top: 30px;
}
.publicwebsite-document-header {
padding-bottom: 0;
height: 0;
}</code>
</property>
<property>
<contentType>LESS</contentType>
......
<?xml version="1.0" encoding="UTF-8"?>
<!--
* See the NOTICE file distributed with this work for additional
* information regarding copyright ownership.
*
* This is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
*
* This software is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this software; if not, write to the Free
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
<xwikidoc version="1.3" reference="PublicWebSite.Code.WebHome" locale="">
<web>PublicWebSite.Code</web>
<name>WebHome</name>
<language/>
<defaultLanguage>en</defaultLanguage>
<translation>0</translation>
<creator>xwiki:XWiki.Admin</creator>
<creationDate>1514761200000</creationDate>
<parent>Main.WebHome</parent>
<author>xwiki:XWiki.Admin</author>
<contentAuthor>xwiki:XWiki.Admin</contentAuthor>
<date>1514761200000</date>
<contentUpdateDate>1514761200000</contentUpdateDate>
<version>1.1</version>
<title>Code</title>
<comment/>
<minorEdit>false</minorEdit>
<syntaxId>xwiki/2.1</syntaxId>
<hidden>false</hidden>
<content>{{children /}}</content>
</xwikidoc>
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment