Si vous constatez la perte de tickets, de commentaires ou de projets, veuillez consulter la page https://status.framasoft.org/incident/626.

Commit a8a2e087 authored by robin banquo's avatar robin banquo

ajout btn haut de page

parent eb142664
......@@ -49,12 +49,12 @@
</repeat>
<check if="{{ @showNavbarMenu }}">
<a href="#" data-activates="mobileNav" class="button-collapse no-margin"><i class="material-icons second-color">menu</i></a>
<ul class="side-nav menu-background" style=" margin-top: 56px" id="mobileNav">
<ul class="side-nav menu-background" id="mobileNav" style=" margin-top: 56px" id="mobileNav">
<check if="{{ @siteOptions['params']['isPublished'] || @isAdminPage}}">
<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" 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>
......
......@@ -25,4 +25,7 @@ $(document).ready(function () {
})
$(".button-collapse").sideNav();
$('.navItems').click(()=>{
$('.button-collapse').sideNav('hide');
})
})
\ No newline at end of file
......@@ -316,7 +316,7 @@ MediaManagment = {
<div class="absolute " style="right : 20px; bottom: 20px; z-index: 7000">
<a href="#!" id="rotateImg" class=" btn btn-floating white-text frama-orange hover-frama-purple waves-effect waves-green "><i class="material-icons left">rotate_left</i></a>
</div>
<div id="upload-demo" style="background-image: url('public/img/background-a.png');width:100%;padding:0px;height: calc(100%-100px);margin-top:00px"></div>
<div id="upload-demo" style="background-image: url('public/img/background-a.png');width:100%;height: calc(100%-100px);margin-top:00px"></div>
`)
//ajout de toutes le images
......
......@@ -29,7 +29,7 @@
<i class="material-icons">settings</i></a>
</check>
<a class="btn-large second-color second-background waves-effect waves-light" id="btnModuleBtn-{{@id}}" href="{{@fields['btnValue']['value']}}">{{@fields['btnLabel']['value']}}</a>
<a target="_blank" class="btn-large second-color second-background waves-effect waves-light" id="btnModuleBtn-{{@id}}" href="{{@fields['btnValue']['value']}}">{{@fields['btnLabel']['value']}}</a>
</span>
......
......@@ -31,7 +31,7 @@
<i class="material-icons">settings</i></a>
</check>
<a class="btn-large contrasted-color waves-effect waves-light" id="btnModuleBtn-{{@id}}" href="{{@fields['btnValue']['value']}}"
<a target="_blank" class="btn-large contrasted-color waves-effect waves-light" id="btnModuleBtn-{{@id}}" href="{{@fields['btnValue']['value']}}"
style="border: 2px solid {{@siteOptions['theme']['contrasted_color']}} !important; background-color: transparent; box-shadow: none !important;"><b>{{@fields['btnLabel']['value']}}</b></a>
</span>
......
......@@ -38,7 +38,7 @@
<i class="material-icons">settings</i></a>
</check>
<a class="btn-large contrasted-color waves-effect waves-light" id="btnModuleBtn-{{@id}}" href="{{@fields['btnValue']['value']}}"
<a target="_blank" class="btn-large contrasted-color waves-effect waves-light" id="btnModuleBtn-{{@id}}" href="{{@fields['btnValue']['value']}}"
style="border: 2px solid {{@siteOptions['theme']['contrasted_color']}} !important; margin: 0 30px; background-color: transparent; box-shadow: none !important;"><b>{{@fields['btnLabel']['value']}}</b></a>
</span>
......
......@@ -20,7 +20,7 @@ $(document).ready(function () {
if(AgendaId){
if(AgendaType === 'google calendar'){
$('#agendaContainer-'+sectionId).html(
'<iframe src="https://calendar.google.com/calendar/htmlembed?src=' + AgendaId + '" style="border: 0; margin-top: -50px" width="400" height="300" frameborder="0" scrolling="no"></iframe>'
'<iframe src="https://calendar.google.com/calendar/embed?showTitle=0&amp;showPrint=0&amp;showTabs=0&amp;showCalendars=0&amp;showTz=0&amp;height=400&amp;wkst=1&amp;bgcolor=%23ffffff&amp;src=' + AgendaId + '&amp;color=%230F4B38&amp" style="border-width:0" width="800" height="400" frameborder="0" scrolling="no"></iframe>'
);
}else if(AgendaType === 'framagenda'){
$('#agendaContainer-'+sectionId).html(
......
......@@ -3,7 +3,19 @@
<div class="section relative" style="padding-top: 60px !important;padding-bottom: 60px !important; z-index: 10">
<div class="row no-margin relative">
<div class="relative col s12 l7 " >
<div class="col s12 xl4" style="padding: 0 25px 0 0 !important;">
<div class="row">
<div class="col s12 second-color title-font editable " id="moduleValue-title">
{{@fields['title']['value'] | raw}}
</div>
</div>
<div class="row">
<div class="col s12 second-color main-font editable" id="moduleValue-content" style="text-align: justify">
{{@fields['content']['value'] | raw}}
</div>
</div>
</div>
<div class="relative col s12 xl8 " >
<check if="{{ @isAdminPage }}">
<a class="btn-floating waves-effect waves-light lightButton absolute tooltipped moduleBtn modal-trigger" href="#editAgendaModal-{{@id}}" data-position="left"
data-delay="250" data-tooltip="Importer l'agenda" style=" right: 0px; top: 0px; z-index: 1000">
......@@ -12,29 +24,18 @@
</check>
<div class="agenda-container" id="agendaContainer-{{@id}}">
<check if="{{ @fields['agendaType']['value'] == 'google calendar' }}">
<iframe src="https://calendar.google.com/calendar/htmlembed?src={{@fields['agendaId']['value']}}" style="border: 0; margin-top: -50px" width="800" height="600" frameborder="0" scrolling="no"></iframe>
<iframe src="https://calendar.google.com/calendar/embed?showTitle=0&amp;showPrint=0&amp;showTabs=0&amp;showCalendars=0&amp;showTz=0&amp;height=400&amp;wkst=1&amp;bgcolor=%23ffffff&amp;src={{@fields['agendaId']['value']}}&amp;color=%230F4B38&amp" style="border-width:0" width="800" height="400" frameborder="0" scrolling="no"></iframe>
</check>
<check if="{{ @fields['agendaType']['value'] == 'framagenda' }}">
<iframe width="400" height="215" src="https://framagenda.org/index.php/apps/calendar/embed/{{@fields['agendaId']['value']}}"></iframe>
<iframe width="400" height="200" src="https://framagenda.org/index.php/apps/calendar/embed/{{@fields['agendaId']['value']}}"></iframe>
</check>
</div>
</div>
<div class="col s12 l5" style="padding: 0 0 0 25px !important;">
<div class="row">
<div class="col s12 second-color title-font editable " id="moduleValue-title">
{{@fields['title']['value'] | raw}}
</div>
</div>
<div class="row">
<div class="col s12 second-color main-font editable" id="moduleValue-content" style="text-align: justify">
{{@fields['content']['value'] | raw}}
</div>
</div>
</div>
</div>
......
......@@ -34,7 +34,7 @@
</check>
<a class=" main-background waves-effect waves-light center-align" id="socialBtn-{{@socialMediaName}}-{{@id}}" href="{{@fields[@socialMediaName]['value']}}">
<a target="_blank" class=" main-background waves-effect waves-light center-align" id="socialBtn-{{@socialMediaName}}-{{@id}}" href="{{@fields[@socialMediaName]['value']}}">
<img src="app/views/modules/social_media/{{@socialMediaName}}.png" alt="{{@socialMediaName}}" class="responsive-img tooltipped" style="margin: 0"
data-position="top"
data-delay="250" data-tooltip="{{@socialMediaName}}" >
......
......@@ -35,7 +35,7 @@
more_vert</i>
</div>
</div>
<div class="card-reveal second-background" style="overflow-x: hidden; opacity: 0.80 ; margin-top: -5px !important;">
<div class="card-reveal second-background" style="overflow-x: hidden; opacity: 0.90 ; margin-top: -5px !important;">
<div class="card-title">
<i class="material-icons {{@isAdminPage?'left' : 'right' }} second-color ">close</i></span></div>
......
......@@ -35,8 +35,10 @@
</check>
</repeat>
<a class="fixed btn-floating btn-large menu-background waves-effect waves-light tooltipped light-shadow" data-position="left"
data-delay="350" data-tooltip="retour haut de page" id="ScrollTopBtn" style="opacity : 0; z-index: 200 !important; bottom: 20px; right: 20px ">
<i class="material-icons second-color medium">arrow_upward</i>
</a>
<check if="{{ @isAdminPage }}">
<include href="./base/editBtns/addSectionModal.htm"/>
<include href="./base/includes/saveBtn.htm"/>
......
......@@ -16,27 +16,42 @@
});
}); // end of document ready
})(jQuery); // end of jQuery name space
$(document).ready(function () {
$('#goToParams-Unpublished').click(function () {
$("a[href=#options-params]").click()
})
$('#goToParams-Unpublished').click(function () {
$("a[href=#options-params]").click()
})
//htmlParser.unformatBySelector('.editable');
$('.switchViewBtn').click(function (e) {
e.preventDefault()
let scrolled = document.documentElement.scrollTop
let visibleSectionId = ""
$('section').each(function () {
if(this.offsetTop>scrolled -200 && !visibleSectionId){
visibleSectionId = this.id
$('.switchViewBtn').click(function (e) {
e.preventDefault()
let scrolled = document.documentElement.scrollTop
let visibleSectionId = ""
$('section').each(function () {
if (this.offsetTop > scrolled - 200 && !visibleSectionId) {
visibleSectionId = this.id
}
}
})
let href = $(this).attr('href')
window.location.href = href + '#' + visibleSectionId;
})
let href = $(this).attr('href')
window.location.href = href+'#'+visibleSectionId;
})
window.onscroll = function() {scrollFunction()};
function scrollFunction() {
if (document.body.scrollTop > 20 || document.documentElement.scrollTop > 20) {
document.getElementById("ScrollTopBtn").style.opacity = "1";
} else {
document.getElementById("ScrollTopBtn").style.opacity = "0";
}
}
// When the user clicks on the button, scroll to the top of the document
$('#ScrollTopBtn').click(()=> {
$('html, body').animate( { scrollTop: $('body').offset().top }, 500 ); // Go
return false;
})
})
\ No newline at end of file
......@@ -15,13 +15,13 @@
}
},
"theme": {
"name": "Hard Sun",
"menu_background": "#FFFFFF",
"main_background": "#FFFFFF",
"main_color": "#444444",
"contrasted_color": "#FFFFFF",
"second_background": "#FFB839",
"second_color": "#563529"
"name": "Darkly",
"menu_background": "#131313",
"main_background": "#232323",
"main_color": "#d9c4ae",
"contrasted_color": "#ff9300",
"second_background": "#131313",
"second_color": "#ff900d"
},
"params": {
"title": "framasite",
......
......@@ -27,6 +27,29 @@
"type": "text",
"value": "<h5>Configuration simple et personnalis\u00e9e<\/h5><p>Nous avons essay\u00e9 de trouver le parfait compromis entre simplicit\u00e9 et options vari\u00e9es<\/p>"
}
},
"inMenuAs": "sdgvfsfvdxfvdf"
},
{
"id": "5a99b4164268e",
"module": "calendar",
"fields": {
"agendaType": {
"type": "text",
"value": "framagenda"
},
"agendaId": {
"type": "text",
"value": "HTgfkNSppLJDLJfW"
},
"title": {
"type": "text",
"value": "<h4>Agenda<\/h4>"
},
"content": {
"type": "text",
"value": "<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Amet architecto assumenda consequuntur esse eum facere, illum libero molestiae nam <\/p>"
}
}
},
{
......@@ -39,7 +62,7 @@
},
"agendaId": {
"type": "text",
"value": "h8q8447s6ndcpn4bjsulob6egs%40group.calendar.google.com&ctz=Europe%2FParis"
"value": "robin.caramaschi%40gmail.com&amp;ctz=Europe%2FParis"
},
"title": {
"type": "text",
......@@ -49,7 +72,8 @@
"type": "text",
"value": "<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Amet architecto assumenda consequuntur esse eum facere, illum libero molestiae nam <\/p>"
}
}
},
"inMenuAs": "fghghfhf ggh hfgh fh"
},
{
"id": "5a96a2ad3995f",
......
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