Commit 30191a50 authored by Robin Caramaschi's avatar Robin Caramaschi

Merge branch 'master' into 'master'

Compatibilité PHP 7.2 + fix module three_goals

See merge request framasoft/PrettyNoemieCMS!21
parents 826dacef 5e0de2b9
......@@ -5,7 +5,7 @@ RewriteEngine On
# In such cases, it should be the path (relative to the document root)
# containing this .htaccess file
#
RewriteBase /
#RewriteBase /
RewriteRule ^(tmp)\/|\.ini$ - [R=404]
......
......@@ -13,22 +13,22 @@
<true>
</true>
<false>
<div class="relative moduleSelectorContainer {{@module[tags]}}">
<div class="relative moduleSelectorContainer {{@module['tags']}}">
<div class="infoModuleBtn absolute " style="top: 8px; left: 8px ; z-index: 6100; cursor: help">
<i class="material-icons frama-orange-text tooltipped" data-position="right"
data-delay="50" data-tooltip="{{@module[description]}}">info_outline</i>
data-delay="50" data-tooltip="{{@module['description']}}">info_outline</i>
</div>
<div class="row parent-hover relative white hoverBorderInBox chooseModuleBtn light-shadow " style="break-inside: avoid-column !important;
-webkit-column-break-inside: avoid !important; cursor: pointer; margin-bottom: 30px; padding: 6px !important; overflow: visible" id="chooseModuleBtn-{{@module[name]}}">
-webkit-column-break-inside: avoid !important; cursor: pointer; margin-bottom: 30px; padding: 6px !important; overflow: visible" id="chooseModuleBtn-{{@module['name']}}">
<div class="row no-margin frama-purple-text ">
<h5 class="center-align no-margin" style="padding: 5px 0 10px 0">
{{@module[title]}}</h5>
{{@module['title']}}</h5>
</div>
<div class="row no-margin no-padding ">
<img src="app/views/modules/{{@module[name]}}/preview.png" class="responsive-img no-margin" style=" background-color: rgb(255,255,255); !important; ; padding: 0 5px">
<img src="app/views/modules/{{@module['name']}}/preview.png" class="responsive-img no-margin" style=" background-color: rgb(255,255,255); !important; ; padding: 0 5px">
</div>
<span class="btn-floating waves-effect waves-light children-hover frama-orange absolute" style="bottom: -20px; left: 50%; margin-left: -20px"><i class="material-icons">add</i></span>
</div>
......@@ -42,4 +42,4 @@
</div>
</div>
<include href="./base/editBtns/addSectionForm.htm"/>
\ No newline at end of file
<include href="./base/editBtns/addSectionForm.htm"/>
......@@ -6,7 +6,7 @@
<script>
SiteOptions = {{@siteOptionsJson |raw}};
CSRFToken= '{{@SESSION[CSRFToken]}}'
CSRFToken= '{{@SESSION['CSRFToken']}}'
isAdminPage ="{{@isAdminPage}}"
scrollFireOptions = []
</script>
......
......@@ -28,7 +28,7 @@
<repeat group="{{ @siteStructure }}" value="{{ @section }}">
<check if="{{ @section['inMenuAs'] }}">
<li class="relative ">
<a href="#{{@section[id]}}" class="second-color main-font" style="font-size: larger">{{@section['inMenuAs']}}</a>
<a href="#{{@section['id']}}" class="second-color main-font" style="font-size: larger">{{@section['inMenuAs']}}</a>
<check if="{{ @isAdmin && @isAdminPage }}">
<a href="#!" class="btn-floating waves-effect waves-light frama-orange hover-frama-purple absolute tooltipped show-on-li-hover editMenuLabel" data-position="right"
data-delay="350" data-tooltip="Modifier" style="top: 3px; left: -20px; z-index: 1500 !important;" id="editMenuLabel-{{@section['id']}}-{{@section['inMenuAs']}}"><i class="material-icons">edit</i></a>
......@@ -54,7 +54,7 @@
<repeat group="{{ @siteStructure }}" value="{{ @section }}">
<check if="{{ @section['inMenuAs'] }}">
<li class="relative " style="margin-top: -10px">
<a href="#{{@section[id]}}" class="second-color main-font navItems" style="font-size: larger">{{@section['inMenuAs']}}</a>
<a href="#{{@section['id']}}" class="second-color main-font navItems" style="font-size: larger">{{@section['inMenuAs']}}</a>
</li>
</check>
</repeat>
......@@ -65,4 +65,4 @@
</div>
</nav>
\ No newline at end of file
</nav>
......@@ -2,8 +2,8 @@
<input type="text" class="displaynone" name="CSRFToken" value="{{@CSRFToken}}">
<input type="text" name ="hash" class="displaynone">
<repeat group="{{ @siteStructure }}" value="{{ @section }}">
<repeat group="{{ @section[fields] }}" key=" {{@fieldName}}" value="{{ @field }}">
<input name="{{'uglyForm-'.@section[id] . '-' .@fieldName}}" type="{{@field[type]}}" value="{{@field[value]}}">
<repeat group="{{ @section['fields'] }}" key=" {{@fieldName}}" value="{{ @field }}">
<input name="{{'uglyForm-'.@section['id'] . '-' .@fieldName}}" type="{{@field['type']}}" value="{{@field['value']}}">
</repeat>
</repeat>
</form>
......@@ -10,7 +10,7 @@
<include href="./base/nav/nav.htm"/>
<repeat group="{{ @siteStructure }}" key="{{ @position }}" value="{{ @section}}">
<check if="{{ @section[id] === 'footer' }}">
<check if="{{ @section['id'] === 'footer' }}">
<true>
......@@ -20,13 +20,13 @@
</true>
<false>
<section class="relative moduleSectionContainer" id="{{@section[id]}}">
<include if="{{ @isAdminPage }}" href="./base/editBtns/addSection.htm" with="reference={{@section[id]}},positionReference='before'"/>
<section class="relative moduleSectionContainer" id="{{@section['id']}}">
<include if="{{ @isAdminPage }}" href="./base/editBtns/addSection.htm" with="reference={{@section['id']}},positionReference='before'"/>
<include href="{{ './modules/' . @section['module'] . '/module.htm' }}" with="id={{@section[id]}},fields={{@section[fields]}}"/>
<include href="{{ './modules/' . @section['module'] . '/module.htm' }}" with="id={{@section['id']}},fields={{@section['fields']}}"/>
<check if="{{ @isAdminPage }}">
<include href="./base/generalModuleOptions/generalModuleOptions.htm" with="id={{@section[id]}}"/>
<include href="./base/generalModuleOptions/generalModuleOptions.htm" with="id={{@section['id']}}"/>
</check>
......@@ -51,4 +51,4 @@
<include href="./base/includes/scripts.htm"/>
<include href="./base/siteOptionsModal/mediaManagment/croppingModal.htm" />
</body>
</html>
\ No newline at end of file
</html>
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