Commit acbb4a28 authored by Raph El's avatar Raph El
Browse files

Hotfix et modif design divers sur Raffinerie

parent e1892572
......@@ -257,6 +257,18 @@
"open" : true,
"subdomainName" : "Adhérer",
"placeholderMainSearch" : "Adhérer"
},
"#modeemploie" : {
"hash" : "#app.view",
"icon" : "",
"urlExtern" : "http://laraffinerie.re/mode-d-emploi-site-laraffinerie.re.pdf",
"target" : true,
"useHeader" : true,
"useFilter" : false,
"inMenu" : true,
"open" : true,
"subdomainName" : "Mode d'emploi",
"placeholderMainSearch" : "Mode d'emploi"
}
},
"filters" : {
......
<footer class=" text-right col-xs-12 pull-left padding-10 footerRaffinerie"
style="height: 70px; background-color : white ; ">
style="height: 70px; background-color : white ; z-index: 30000;">
<a href="#apropos" class="lbh">Présentation détaillée</a> -
<a href="#mention" class="lbh">Infos légales</a> -
<a href="#plan" class="lbh">Nous trouver</a> -
......
......@@ -252,7 +252,7 @@ $Parsedown = new Parsedown();
</div>
<div class="col-xs-12 col-sm-10 col-sm-offset-1 no-padding margin-top-50">
<div class="col-xs-12 no-padding">
<h2 class="titleFont2"> Actualité </h2>
<h2 class="titleFont2"> Actualités </h2>
<hr style="margin-top: 5px; border-bottom: 1px dashed #000000;"/>
</div>
<div id="newsstream" class="col-xs-12 no-padding">
......
......@@ -185,14 +185,15 @@ if (Authorisation::isElementAdmin($id, $type, @Yii::app()->session["userId"])) {
<div class="col-xs-12 no-padding projectHeaderOptionsCont2">
<div id="projectShortDescription" class="col-xs-12 col-sm-8">
<div id="projectShortDescription" class="col-xs-12 ">
<?php if(!empty($element["shortDescription"])){ ?>
<div class=" col-xs-12 no-padding"><?php echo $element["shortDescription"] ; ?></div>
<div class=" col-xs-12 padding-5"><?php echo $element["shortDescription"] ; ?></div>
<?php } ?>
<a href="javascript:;" id="apropos" class="pull-right" style="color: white">+ d'infos / contact</a>
</div>
<div id="" class="col-xs-12 col-sm-4 padding-top-15">
<div id="" class="col-xs-12 ">
<a href="javascript:;" id="apropos" class="pull-left" style="color: white; font-size: 16px">+ d'infos / contact</a>
<?php if(@Yii::app()->session["userId"] && $canEdit==true){ ?>
<!-- <div class="pull-right margin-right-10 customTabTriggerProj customBtnFull projectBgColor projectBgColorHover" style="background-color: rgba(122, 186, 89, 1);"> -->
<ul class="nav navbar-nav btn pull-right " id="paramsMenu">
......@@ -212,6 +213,7 @@ if (Authorisation::isElementAdmin($id, $type, @Yii::app()->session["userId"])) {
<a href="javascript:;" id="inviteRaf" data-type-dir="projects" class="bg-white ssmla" style=""></a>
<a href="#element.invite.type.<?php echo $type ;?>.id.<?php echo $id ;?>" class="lbhp"><?php echo Yii::t("common", "Invite"); ?></a>
<a href="javascript:;" id="documents" class="bg-white ssmla">Fichiers</a>
<a href="javascript:;" id="settings" class="bg-white ssmla">
<?php echo Yii::t("common", "Settings"); ?>
</a>
......@@ -221,12 +223,12 @@ if (Authorisation::isElementAdmin($id, $type, @Yii::app()->session["userId"])) {
</ul>
<!-- </div> -->
<?php
// if( $id == Yii::app()->session["costum"]["contextId"]){ ?>
if( $type == Project::COLLECTION){ ?>
<a href="javascript:;" id="create" class="btn btn-default bg-green ssmla pull-right margin-right-10">
<i class="fa fa-plus"></i>
</a>
<?php // } ?>
<?php } ?>
<a href="https://www.laraffinerie.re/nextcloud" id="create" class="btn btn-default bg-green ssmla pull-right margin-right-10" target="_blank"><i class="fa fa-folder"></i></a>
<?php } ?>
<!-- <div class="pull-right margin-right-10 customTabTriggerContacts customBtnFull projectBgColor projectBgColorHover" style="background-color: rgba(122, 186, 89, 1);">
<a href="javascript:;" id="projectContacts" class="" style="color: white">Contacts</a>
......@@ -240,6 +242,7 @@ if (Authorisation::isElementAdmin($id, $type, @Yii::app()->session["userId"])) {
</div> -->
<!-- <div class="pull-right margin-right-10 customTabTriggerDescr customBtnFull projectBgColor projectBgColorHover" style="background-color: rgba(122, 186, 89, 1);"> -->
<a href="https://meet.jit.si/<?php echo $element['slug'] ; ?>" target="_blank" id="btnChatRaffinerie" class="btn btn-default bg-green pull-right margin-right-10" style="color: white">Visio</a>
<a href="https://chat.communecter.org/channel/<?php echo $element['slug'] ; ?>" target="_blank" id="btnChatRaffinerie" class="btn btn-default bg-green pull-right margin-right-10" style="color: white">Tchat</a>
<!-- </div> -->
......@@ -419,22 +422,22 @@ if (Authorisation::isElementAdmin($id, $type, @Yii::app()->session["userId"])) {
<div class="projectInfosHeader">
<ul class="row nav nav-tabs">
<?php if($type == Event::COLLECTION){ ?>
<li class="nav-tab col-xs-6">
<li class="nav-tab col-xs-12">
<a class="tab active" href="javascript:;" id="journal">Journal</a>
</li>
<li class="nav-tab col-xs-6">
<!-- <li class="nav-tab col-xs-6">
<a class="tab" href="javascript:;" id="documents">Fichiers</a>
</li>
</li> -->
<?php } else { ?>
<li class="nav-tab col-xs-4">
<li class="nav-tab col-xs-6">
<a class="tab active" href="javascript:;" id="journal">Journal</a>
</li>
<li class="nav-tab col-xs-4">
<li class="nav-tab col-xs-6">
<a class="tab" href="javascript:;" id="agenda" data-type-dir="events">Agenda</a>
</li>
<li class="nav-tab col-xs-4">
<!-- <li class="nav-tab col-xs-4">
<a class="tab" href="javascript:;" id="documents">Fichiers</a>
</li>
</li> -->
<?php } ?>
</ul>
</div>
......@@ -526,59 +529,13 @@ if (Authorisation::isElementAdmin($id, $type, @Yii::app()->session["userId"])) {
var initEvent = false;
var initDoc = false;
var initNews = true;
pageProfil.initCallB = function(){
$(".openFolder[data-folder-name='Documents']").parent().remove();
$(".openFolder").parent().removeClass('col-xs-4').addClass('col-xs-6');
};
pageProfil.views.gallery = function(){
mylog.log("pageProfil.views.gallery");
var url = "gallery/index/type/"+typeItem+"/id/"+contextData.id;
if(notNull(pageProfil.params.dir))
url+="/docType/"+pageProfil.params.dir;
if(notNull(pageProfil.params.key))
url+="/contentKey/"+pageProfil.params.key;
if(notNull(pageProfil.params.folderId))
url+="/folderId/"+pageProfil.params.folderId;
ajaxPost('#central-container', baseUrl+'/'+moduleId+'/'+url,
null,
function(){
$(".openFolder[data-folder-name='Documents']").parent().remove();
$(".openFolder").parent().removeClass('col-xs-4').addClass('col-xs-6');
},"html");
};
function initMenuGallery(){
html="";
$.each(rootsGallery, function(docT, value){
if(docT != "file"){
htmlBtn= ' <a href="javascript:;" class="filter-folder-gallery col-xs-12">'+
'<div class="">' +
'<span class="titleAlbum"><i class="fa fa-'+value.icon+'"></i> '+value.title+'</span>'+/*<br/><br/>'+
'<span>'+value.explain+'</span>'+*/
'</div>'+
' </a>';
html += '<li class="content_folder_file mix library-img col-xs-6" style="margin:0px !important; padding:5px;" data-cat="1">'+
' <div class="portfolio-item portfolio-item-album openFolder" data-folder="" data-folder-name="'+value.title+'" data-doctype="'+docT+'" data-key="">'+
'<div class="container-img col-xs-4 no-padding img circle" style="width:100%; height:auto; box-shadow: 0px 0px 20px -2px black;">'+
' <img src="'+value.img+'" class="initLibrary img-responsive"alt="">'+
'</div>'+
htmlBtn +
' </div>' +
'</li>';
}
});
$("#GridAlbums").html(html);
$("#Grid").html("");
}
jQuery(document).ready(function() {
$(".projectHeaderOptions").css( "top", $("#contentBanner").height() - $(".projectHeaderOptions").height() -10 );
var topB = "204px";
if(contextData.profilBannerUrl){
topB = "260px";
}
$(".projectHeaderOptions").css( "top", topB );
$("#projectDescription").hide();
......
Supports Markdown
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