Commit 9038762b authored by Tibor Katelbach's avatar Tibor Katelbach
Browse files

Merge remote-tracking branch 'origin/master'

parents 70632cf0 9a5ff5e3
......@@ -678,6 +678,7 @@ function initPageTable(number){
var parentId = $(this).data("coop-parentid");
var parentType = $(this).data("coop-parenttype");
var afterLoad = null;
onchangeClick=false;
location.hash="#dda?"+coopType+"."+coopId+"."+parentId+"."+parentType;
uiCoop.prepPreview(coopType,coopId,idParentRoom,parentId,parentType,afterLoad);
if( $(this).data("coop-section") ){
......@@ -2571,9 +2572,9 @@ var directory = {
str = "";
if(size == "S")
str += "<div class='col-lg-4 col-md-4 col-sm-6 col-xs-12 blockCoop"+thisId+" "+filterClass+" coopFilter coop-wraper margin-bottom-10 ' "+sortData+" style='word-wrap: break-word; overflow:hidden;'>";
str += "<div class='col-lg-4 col-md-4 col-sm-6 col-xs-12 blockCoop"+thisId+" "+filterClass+" coopFilter coop-wraper margin-bottom-10 ' "+sortData+" style='word-wrap: break-word; '>";
else
str += "<div class='col-xs-12 coop-wraper margin-bottom-10 coopFilter "+filterClass+" ' "+sortData+" style='word-wrap: break-word; overflow:hidden;'>";
str += "<div class='col-xs-12 coop-wraper margin-bottom-10 coopFilter "+filterClass+" ' "+sortData+" style='word-wrap: break-word;'>";
linkParams = " data-coop-type='"+ params.type + "' "+
" data-coop-id='"+ thisId + "' "+
......@@ -2605,9 +2606,9 @@ var directory = {
// NAME
if(name != ""){
str += '<a href="javascript:;" class="openCoopPanelHtml" style="text-decoration:none;" '+linkParams+' >'+
'<h4 class="panel-title tooltips letter-turq" data-toggle="tooltip" data-placement="top" data-original-title="'+name+'">'+
'<h4 class="panel-title tooltips letter-turq" data-toggle="tooltip" data-placement="bottom" data-original-title="'+name+'">'+
'<i class="fa '+ params.ico + '"></i> '+
( (name.length > 140) ? name.substring(0,30)+"..." : name ) + '</h4></a>';
( (name.length > 100) ? name.substring(0,100)+"..." : name ) + '</h4></a>';
}
......
......@@ -6,6 +6,13 @@ dynForm = {
onLoads : {
sub : function(){
dyFInputs.setSub("bg-url");
if(typeof contextData != "undefined" && contextData != null){
$("#parentId").val(contextData.id);
$("#parentType").val(contextData.type);
}
},
},
afterSave : function(){
......
......@@ -91,12 +91,13 @@ function getFileItem(k,v, edit){
titleDoc="";
if(notNull(v.name))
titleDoc=v.name;
var htmlThumbail = '<li class="content_file '+k+' col-sm-12 col-md-12 col-xs-12 no-padding" data-cat="1" id="'+v.id+'">'+
idDoc=v._id.$id;
var htmlThumbail = '<li class="content_file '+k+' col-sm-12 col-md-12 col-xs-12 no-padding" data-cat="1" id="'+idDoc+'">'+
' <div class="portfolio-item">';
if(edit){
htmlThumbail += '<div class="checkbox-content pull-left">'+
'<label>'+
'<input type="checkbox" class="checkPhoto checkbox-info" data-value="'+v.id+'">'+
'<input type="checkbox" class="checkPhoto checkbox-info" data-value="'+idDoc+'">'+
'<span class="cr"><i class="cr-icon fa fa-check"></i></span>'+
'</label>'+
'</div>';
......@@ -109,7 +110,7 @@ function getFileItem(k,v, edit){
' <i class="fa fa-upload"></i>'+
' </a>';
if(edit){
htmlThumbail+= ' <a href="javascript:;" onclick="updateDocument(\''+v.id+'\', \''+titleDoc+'\')">' +
htmlThumbail+= ' <a href="javascript:;" onclick="updateDocument(\''+idDoc+'\', \''+titleDoc+'\')">' +
' <i class="fa fa-pencil"></i>'+
' </a>';
}
......
......@@ -673,7 +673,9 @@ class CommunecterController extends Controller
}*/
//managed public and private sections through a url manager
if( Yii::app()->controller->id == "admin" && !Yii::app()->session[ "userIsAdmin" ] )
if( Yii::app()->controller->id == "admin" && !Yii::app()->session[ "userIsAdmin" ]
&& (!@Yii::app()->session[ "custom" ] || !@Yii::app()->session[ "custom" ]["admins"]
|| !Yii::app()->session[ "custom" ]["admins"][Yii::app()->session["userId"]]))
throw new CHttpException(403,Yii::t('error','Unauthorized Access.'));
if( Yii::app()->controller->id == "adminpublic" && ( !Yii::app()->session[ "userIsAdmin" ] && !Yii::app()->session[ "userIsAdminPublic" ] ) )
......
......@@ -182,7 +182,7 @@
<div class="col-md-12 col-sm-12 col-xs-12" id="navigationAdmin">
<div class="col-md-12 col-sm-12 col-xs-12 text-center">
<img src="<?php echo $logo ?>"
class="" height="100"><br/>
class="img-responsive" height="100"><br/>
<h3><?php echo $title ?></h3>
</div>
<?php
......@@ -192,7 +192,7 @@
id="div-select-create">
<div class="col-md-12 col-sm-12 col-xs-12 padding-15 shadow2 bg-white ">
<h4 class="text-center margin-top-15" style="">
<h4 class="text-center margin-top-15">
<a class="btn btn-link pull-right text-dark" id="btn-close-select-create" style="margin-top:-10px;">
<i class="fa fa-times-circle fa-2x"></i>
</a>
......@@ -224,7 +224,7 @@
<?php foreach(Yii::app()->session["paramsConfig"]["adminPanel"] as $key => $v){
if((!isset($v["super"]) || empty($v["super"]) || Role::isSuperAdmin(Role::getRolesUserId(Yii::app()->session["userId"]))) && $key!="add"){
if(!isset($v["sourceKey"]) || (isset(Yii::app()->session["custom"]) && isset(Yii::app()->session["custom"]["sourceKey"]))){?>
<li class="list-group-item col-md-4 col-sm-6 ">
<li class="list-group-item col-md-4 col-sm-6 col-xs-12">
<a href="javascript:;" class="<?php echo $v["class"] ?>" id="<?php echo $v["id"] ?>" style="cursor:pointer;">
<i class="fa fa-<?php echo $v["icon"] ?> fa-2x"></i>
<?php echo Yii::t("admin", $v["label"]); ?>
......
......@@ -79,6 +79,10 @@ if( @$_GET["el"] || @$custom )
if(@$el["custom"]["metaImg"]){
$c["metaImg"] = Yii::app()->getRequest()->getBaseUrl(true).Yii::app()->getModule( Yii::app()->params["module"]["parent"] )->getAssetsUrl().$el["custom"]["metaImg"];
}
if(@$el["custom"]["logoMin"]){
$c["logoMin"] = Yii::app()->getModule( Yii::app()->params["module"]["parent"] )->getAssetsUrl().$el["custom"]["logoMin"];
}
if (@$el["custom"]["favicon"])
$c["favicon"] = Yii::app()->getModule( Yii::app()->params["module"]["parent"] )->getAssetsUrl().$el["custom"]["favicon"];
$c["admins"]= Element::getCommunityByTypeAndId($c["type"], $c["id"], Person::COLLECTION,"isAdmin");
......@@ -280,6 +284,11 @@ if( @Yii::app()->session['custom'] ){ ?>
}
});
}
str+="@media (max-width: 767px){"+
"#mainNav{margin-top:0px !important;}"+
"#mainNav .menu-btn-top{font-size:22px !important}}"+
"#mainNav .logo-menutop{height:40px}"+
"}";
str+="</style>";
$("head").append(str);
......
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