Commit 021051fb authored by Pantiru Paul's avatar Pantiru Paul

XWEB-1949: Organise and commit the code

parent b26f039f
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
<?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.BlockImageMacro" locale="">
<web>PublicWebSite.Code</web>
<name>BlockImageMacro</name>
<language/>
<defaultLanguage>en</defaultLanguage>
<translation>0</translation>
<creator>xwiki:XWiki.Admin</creator>
<creationDate>1514761200000</creationDate>
<parent>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>BlockImageMacro</title>
<comment/>
<minorEdit>false</minorEdit>
<syntaxId>xwiki/2.1</syntaxId>
<hidden>true</hidden>
<content/>
<object>
<name>PublicWebSite.Code.BlockImageMacro</name>
<number>0</number>
<className>XWiki.WikiMacroClass</className>
<guid>7655bb1e-262a-4bf4-b57f-c130295fc7a2</guid>
<class>
<name>XWiki.WikiMacroClass</name>
<customClass/>
<customMapping/>
<defaultViewSheet/>
<defaultEditSheet/>
<defaultWeb/>
<nameField/>
<validationScript/>
<code>
<disabled>0</disabled>
<editor>Text</editor>
<name>code</name>
<number>9</number>
<prettyName>Macro code</prettyName>
<rows>20</rows>
<size>40</size>
<unmodifiable>0</unmodifiable>
<classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
</code>
<contentDescription>
<contenttype>PureText</contenttype>
<disabled>0</disabled>
<editor>PureText</editor>
<name>contentDescription</name>
<number>8</number>
<prettyName>Content description (Not applicable for "No content" type)</prettyName>
<rows>5</rows>
<size>40</size>
<unmodifiable>0</unmodifiable>
<classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
</contentDescription>
<contentType>
<cache>0</cache>
<disabled>0</disabled>
<displayType>select</displayType>
<multiSelect>0</multiSelect>
<name>contentType</name>
<number>7</number>
<prettyName>Macro content type</prettyName>
<relationalStorage>0</relationalStorage>
<separator>|</separator>
<separators>|</separators>
<size>1</size>
<unmodifiable>0</unmodifiable>
<values>Optional|Mandatory|No content</values>
<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
</contentType>
<defaultCategory>
<disabled>0</disabled>
<name>defaultCategory</name>
<number>4</number>
<prettyName>Default category</prettyName>
<size>30</size>
<unmodifiable>0</unmodifiable>
<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
</defaultCategory>
<description>
<contenttype>PureText</contenttype>
<disabled>0</disabled>
<editor>PureText</editor>
<name>description</name>
<number>3</number>
<prettyName>Macro description</prettyName>
<rows>5</rows>
<size>40</size>
<unmodifiable>0</unmodifiable>
<classType>com.xpn.xwiki.objects.classes.TextAreaClass</classType>
</description>
<id>
<disabled>0</disabled>
<name>id</name>
<number>1</number>
<prettyName>Macro id</prettyName>
<size>30</size>
<unmodifiable>0</unmodifiable>
<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
</id>
<name>
<disabled>0</disabled>
<name>name</name>
<number>2</number>
<prettyName>Macro name</prettyName>
<size>30</size>
<unmodifiable>0</unmodifiable>
<classType>com.xpn.xwiki.objects.classes.StringClass</classType>
</name>
<supportsInlineMode>
<disabled>0</disabled>
<displayFormType>select</displayFormType>
<displayType>yesno</displayType>
<name>supportsInlineMode</name>
<number>5</number>
<prettyName>Supports inline mode</prettyName>
<unmodifiable>0</unmodifiable>
<classType>com.xpn.xwiki.objects.classes.BooleanClass</classType>
</supportsInlineMode>
<visibility>
<cache>0</cache>
<disabled>0</disabled>
<displayType>select</displayType>
<multiSelect>0</multiSelect>
<name>visibility</name>
<number>6</number>
<prettyName>Macro visibility</prettyName>
<relationalStorage>0</relationalStorage>
<separator>|</separator>
<separators>|</separators>
<size>1</size>
<unmodifiable>0</unmodifiable>
<values>Current User|Current Wiki|Global</values>
<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
</visibility>
</class>
<property>
<code>{{velocity}}
## First, get the parameters of the macro
#set($title = $xcontext.macro.params.title)
#set($image = $xcontext.macro.params.image)
#set($blockExtraClasses = "col-xs-12 col-sm-6")
{{html clean="false" wiki="true"}}
&lt;div class="blockimage $!blockExtraClasses"&gt;
&lt;h2&gt;$title&lt;/h2&gt;
[[image:$!image]]
&lt;/div&gt;
{{/html}}
{{/velocity}}</code>
</property>
<property>
<contentDescription/>
</property>
<property>
<contentType>No content</contentType>
</property>
<property>
<defaultCategory/>
</property>
<property>
<description>This macro aims to ease the display of a single image in a page, along with an optional title.</description>
</property>
<property>
<id>blockImageMacro</id>
</property>
<property>
<name>Image block macro</name>
</property>
<property>
<supportsInlineMode>1</supportsInlineMode>
</property>
<property>
<visibility>Current Wiki</visibility>
</property>
</object>
</xwikidoc>
<?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.BlockParagraphMacro" locale="">
<web>PublicWebSite.Code</web>
<name>BlockParagraphMacro</name>
<language/>
<defaultLanguage>en</defaultLanguage>
<translation>0</translation>
<creator>xwiki:XWiki.Admin</creator>
<creationDate>1514761200000</creationDate>
<parent>PublicWebSite.Code.BlockImageMacro</parent>
<author>xwiki:XWiki.Admin</author>
<contentAuthor>xwiki:XWiki.Admin</contentAuthor>
<date>1514761200000</date>
<contentUpdateDate>1514761200000</contentUpdateDate>
<version>1.1</version>
<title>BlockParagraphMacro</title>
<comment/>
<minorEdit>false</minorEdit>
<syntaxId>xwiki/2.1</syntaxId>
<hidden>true</hidden>
<content/>
</xwikidoc>
......@@ -61,6 +61,8 @@
When the parameter ##images## is left blank, the user can define an illustration content in his macro by adding the separator {{code}}-&lt;*&gt;-{{/code}}.
Content before this separator will be considered as the text of the row, and content after the separator will be considered as the illustrative content.
When no image or illustrative content is given, the text will be displayed in a full row.
Example:
{{code}}
......@@ -302,6 +304,12 @@ Lorem ipso sum. Lorem ipso sum. Lorem ipso sum. Lorem ipso sum. Lorem ipso sum.
margin-bottom: -0.3rem;
width: 100%;
}
h4 {
line-height: 3rem;
font-size: 2.2rem;
margin-top: 0;
margin-bottom: 2.5rem;
}
.owl-nav {
margin-top: 0;
......@@ -362,8 +370,8 @@ Lorem ipso sum. Lorem ipso sum. Lorem ipso sum. Lorem ipso sum. Lorem ipso sum.
position: relative;
box-shadow: 0px 13px 29px 0px rgba(69, 165, 214, 0.25);
img {
border-bottom-left-radius: 1rem;
border-bottom-right-radius: 1rem;
border-bottom-left-radius: 1rem;
border-bottom-right-radius: 1rem;
}
}
......@@ -384,21 +392,21 @@ Lorem ipso sum. Lorem ipso sum. Lorem ipso sum. Lorem ipso sum. Lorem ipso sum.
}
.link-more {
span {
padding-right: 0;
transition: all 0.5s;
font-size: 13px;
}
&amp;:hover {
text-decoration: none;
span {
padding-left: 10px;
transition: all 0.5s;
}
}
&amp;:focus {
text-decoration: none;
}
span {
padding-right: 0;
transition: all 0.5s;
font-size: 13px;
}
&amp;:hover {
text-decoration: none;
span {
padding-left: 10px;
transition: all 0.5s;
}
}
&amp;:focus {
text-decoration: none;
}
}</code>
</property>
<property>
......@@ -568,18 +576,21 @@ Lorem ipso sum. Lorem ipso sum. Lorem ipso sum. Lorem ipso sum. Lorem ipso sum.
#set($textBlockClasses = "${textBlockClasses} col-sm-push-6")
#end
#end
#set($style="")
#if($backgroundImage &amp;&amp; $backgroundImage != "")
#set($backgroundImageURL = $doc.getAttachmentURL($backgroundImage))
#set($style="${style} background-image: url('${backgroundImageURL}');")
#end
#if($color &amp;&amp; $color != "")
#set($style="${style} background-color: ${color};")
#end
#if($height &amp;&amp; $height != "")
#set($style="${style} height: ${height};")
#end
##
## Determine if the content contains an illustration
#set($splitContent = $content.split('-&lt;\*&gt;-'))
#if($splitContent.size() &gt; 1)
......@@ -589,6 +600,16 @@ Lorem ipso sum. Lorem ipso sum. Lorem ipso sum. Lorem ipso sum. Lorem ipso sum.
#set($illustrationContent = $NULL)
#end
## If we don't have any content AND no images given to the macro, we will fallback
## on a full row of text.
#if ($illustrationContent == $NULL &amp;&amp; !$images)
#set($hasIllustrationContent = 0)
#set($textBlockClasses = "col-xs-12 col-md-12")
#set($illustrationBlockClasess = "")
#else
#set($hasIllustrationContent = 1)
#end
{{html clean="false" wiki="true"}}
&lt;div class="${blockName} blockrow row" style="${style}"&gt;
&lt;div class="col-xs-12"&gt;
......@@ -596,7 +617,7 @@ Lorem ipso sum. Lorem ipso sum. Lorem ipso sum. Lorem ipso sum. Lorem ipso sum.
&lt;div class="row blockrow-line"&gt;
&lt;div class="blockrow-text ${textBlockClasses}"&gt;
#if($blockTitle &amp;&amp; $blockTitle != "")
&lt;h2&gt;${blockTitle}&lt;/h2&gt;
&lt;h4&gt;${blockTitle}&lt;/h4&gt;
#end
#if($content &amp;&amp; $content != "")
&lt;p&gt;
......@@ -622,24 +643,26 @@ Lorem ipso sum. Lorem ipso sum. Lorem ipso sum. Lorem ipso sum. Lorem ipso sum.
&lt;/p&gt;
#end
&lt;/div&gt;
&lt;div class="blockrow-illustration ${illustrationBlockClasses}"&gt;
#if ($images != "")
&lt;div #if($imageBrowserHolder!="false") class="browser-holder" #end&gt;
&lt;div id="carousel-${blockName}" class="#if($imageCount &gt; 1)owl-carousel owl-theme #end"&gt;
#foreach($image in $images.split(","))
#set($imageUrl = $doc.getAttachmentURL($image))
&lt;div class="item"&gt;
&lt;img src="${imageUrl}" alt="${image}" class="img-responsive center-block #if($imageCount == 1)blockrow-single-image#end"&gt;
&lt;/div&gt;
#end
#if ($hasIllustrationContent == 1)
&lt;div class="blockrow-illustration ${illustrationBlockClasses}"&gt;
#if ($images != "")
&lt;div #if($imageBrowserHolder!="false") class="browser-holder" #end&gt;
&lt;div id="carousel-${blockName}" class="#if($imageCount &gt; 1)owl-carousel owl-theme #end"&gt;
#foreach($image in $images.split(","))
#set($imageUrl = $doc.getAttachmentURL($image))
&lt;div class="item"&gt;
&lt;img src="${imageUrl}" alt="${image}" class="img-responsive center-block #if($imageCount == 1)blockrow-single-image#end"&gt;
&lt;/div&gt;
#end
&lt;/div&gt;
&lt;/div&gt;
#elseif($illustrationContent)
#elseif($illustrationContent)
${illustrationContent}
${illustrationContent}
#end
&lt;/div&gt;
#end
&lt;/div&gt;
#end
&lt;/div&gt;
&lt;/div&gt;
&lt;/div&gt;
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -175,7 +175,7 @@ xwiki_logo.png|Logo|Person Name - Company|Thanks to XWiki's Structured Wiki conc
.blocktestimonial {
padding-top: 5rem;
padding-bottom: 2.5rem;
padding-bottom: 4rem;
.container {
background-repeat: no-repeat;
background-position: 19rem top;
......@@ -189,7 +189,6 @@ xwiki_logo.png|Logo|Person Name - Company|Thanks to XWiki's Structured Wiki conc
}
.testim-text {
font-family: Roboto;
margin-top: 7rem;
text-align: center;
margin-bottom: 0;
font-size: 1.8rem;
......@@ -228,7 +227,7 @@ xwiki_logo.png|Logo|Person Name - Company|Thanks to XWiki's Structured Wiki conc
.owl-prev {
left: -100px;
position: absolute;
top: 40%;
top: 30%;
padding: 4px 13px 4px 10px !important;
@media (max-width: 767px) {
left: -15px;
......@@ -237,7 +236,7 @@ xwiki_logo.png|Logo|Person Name - Company|Thanks to XWiki's Structured Wiki conc
.owl-next {
position: absolute;
right: -100px;
top: 40%;
top: 30%;
padding: 4px 10px 4px 13px !important;
@media (max-width: 767px) {
right: -15px;
......@@ -247,6 +246,9 @@ xwiki_logo.png|Logo|Person Name - Company|Thanks to XWiki's Structured Wiki conc
.owl-theme .owl-dots .owl-dot.active span, .owl-theme .owl-dots .owl-dot:hover span {
background: @brand-primary;
}
}
.owl-theme .owl-dots, .owl-theme .owl-nav {
margin-bottom: 1rem;
}</code>
</property>
<property>
......@@ -392,7 +394,6 @@ xwiki_logo.png|Logo|Person Name - Company|Thanks to XWiki's Structured Wiki conc
#set($color = $xcontext.macro.params.color)
#set($height = $xcontext.macro.params.height)
#set($shadow = $xcontext.macro.params.shadow)
#set($showQuotes = $xcontext.macro.params.showquotes)
#set($content = $xcontext.macro.content)
#set($style="")
#if($image&amp;&amp;$image!="")
......@@ -406,38 +407,36 @@ xwiki_logo.png|Logo|Person Name - Company|Thanks to XWiki's Structured Wiki conc
#set($style="${style} height: ${height};")
#end
&lt;div class="${blockName} blocktestimonial row" style="${style}"&gt;
&lt;div class="col-xs-12"&gt;
&lt;div class="container" #if("$!{showQuotes}"!='false')style="background-image: url('$doc.getAttachmentURL("quote.png")')"#end&gt;
&lt;div class="container"&gt;
&lt;div class="row"&gt;
&lt;div class="col-xs-12"&gt;
#if($blockTitle &amp;&amp; $blockTitle!="")
&lt;h2 class="text-center sect-header"&gt;${blockTitle}&lt;/h1&gt;
&lt;h2 class="text-center sect-header"&gt;${blockTitle}&lt;/h2&gt;
#end
#if($blockDesc &amp;&amp; $blockDesc!="")
&lt;h4 class="text-center"&gt;${blockDesc}&lt;/h4&gt;
#end
&lt;div class="row"&gt;
&lt;div class="col-xs-12 col-sm-offset-2 col-sm-8"&gt;
&lt;div id="carousel-testim" class="owl-carousel owl-theme"&gt;
#foreach($item in $content.split("\r\n"))
#set($itemData = $item.split("[|]"))
#set($image = $listtool.get($itemData, 0))
#set($imageUrl = $doc.getAttachmentURL($image))
#set($imageAlt = $listtool.get($itemData, 1))
#set($person = $listtool.get($itemData, 2))
#set($text = $listtool.get($itemData, 3))
&lt;div class="item"&gt;
&lt;div class="testim-text"&gt;"${text}"&lt;/div&gt;
&lt;div class="testim-name"&gt;&lt;h6&gt;${person}&lt;/h6&gt;&lt;/div&gt;
&lt;img src="${imageUrl}" alt="${imageAlt}" class="img-responsive center-block"&gt;
&lt;/div&gt;
#end
&lt;/div&gt;
&lt;/div&gt;
&lt;/div&gt;
&lt;/div&gt;
&lt;/div&gt;
&lt;/div&gt;
&lt;div class="row"&gt;
&lt;div class="col-xs-12 col-sm-offset-2 col-sm-8"&gt;
&lt;div id="carousel-testim" class="owl-carousel owl-theme"&gt;
#foreach($item in $content.split("\r\n"))
#set($itemData = $item.split("[|]"))
#set($image = $listtool.get($itemData, 0))
#set($imageUrl = $doc.getAttachmentURL($image))
#set($imageAlt = $listtool.get($itemData, 1))
#set($person = $listtool.get($itemData, 2))
#set($text = $listtool.get($itemData, 3))
&lt;div class="item"&gt;
&lt;div class="testim-text"&gt;"${text}"&lt;/div&gt;
&lt;div class="testim-name"&gt;&lt;h6&gt;${person}&lt;/h6&gt;&lt;/div&gt;
&lt;img src="${imageUrl}" alt="${imageAlt}" class="img-responsive center-block"&gt;
&lt;/div&gt;
#end
&lt;/div&gt;
&lt;/div&gt;
&lt;/div&gt;
&lt;/div&gt;
&lt;/div&gt;
{{/html}}
......
......@@ -190,12 +190,13 @@ Example:
h2 {
font-family: Roboto;
margin-top: 0;
margin-bottom: 2.5rem;
margin-bottom: 0;
color: @btn-success-color;
}
p {
font-family: Roboto;
font-size: 16px;
margin-top: 2.5rem;
margin-bottom: 0;
color: @btn-success-color;
}
......
This diff is collapsed.
......@@ -176,6 +176,9 @@ This allows any row in the content of the document to start at the leftmost of t
display: block;
}
margin-top: -20px;
.breadcrumb {
padding-left: 0;
}
}
/*
......
<?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.Offering.WebHome" locale="">
<web>PublicWebSite.Offering</web>
<name>WebHome</name>
<language/>
<defaultLanguage>en</defaultLanguage>
<translation>0</translation>
<creator>xwiki:XWiki.Admin</creator>
<creationDate>1514761200000</creationDate>
<parent>XWikiComCode.Top Menu</parent>
<author>xwiki:XWiki.Admin</author>
<contentAuthor>xwiki:XWiki.Admin</contentAuthor>
<date>1514761200000</date>
<contentUpdateDate>1514761200000</contentUpdateDate>
<version>1.1</version>
<title>Offering</title>
<comment/>
<minorEdit>false</minorEdit>
<syntaxId>xwiki/2.1</syntaxId>
<hidden>false</hidden>
<content/>
</xwikidoc>
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
<?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.XWiki.Pricing.WebHome" locale="">
<web>PublicWebSite.XWiki.Pricing</web>
<name>WebHome</name>
<language/>
<defaultLanguage>en</defaultLanguage>
<translation>0</translation>
<creator>xwiki:XWiki.Admin</creator>
<creationDate>1514761200000</creationDate>
<parent>PublicWebSite.XWiki.Features.WebHome</parent>
<author>xwiki:XWiki.Admin</author>
<contentAuthor>xwiki:XWiki.Admin</contentAuthor>
<date>1514761200000</date>
<contentUpdateDate>1514761200000</contentUpdateDate>
<version>1.1</version>
<title>Pricing</title>
<comment/>
<minorEdit>false</minorEdit>
<syntaxId>xwiki/2.1</syntaxId>
<hidden>false</hidden>
<content/>
</xwikidoc>
......@@ -149,7 +149,6 @@ sncf.png|Logo SNCF|Denis Clairet - SNCF|Thanks to XWiki's Structured Wiki concep
</attachment>
<attachment>
<filename>logo_sncf.gif</filename>
<mimetype>image/gif</mimetype>
<author>xwiki:XWiki.Admin</author>
<date>1514761200000</date>
<version>1.1</version>
......@@ -168,7 +167,6 @@ sncf.png|Logo SNCF|Denis Clairet - SNCF|Thanks to XWiki's Structured Wiki concep
</attachment>
<attachment>
<filename>sncf.png</filename>
<mimetype>image/png</mimetype>
<author>xwiki:XWiki.Admin</author>
<date>1514761200000</date>
<version>1.1</version>
......
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