Skip to content
Snippets Groups Projects
Commit f2805d75 authored by Uma's avatar Uma
Browse files

Merge branch 'Document_folders_overflow' into 'master' 

Fixes #1212 Documents module folder list broken through overflow

See merge request !502
parents f8876a8a c46f1dca
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
layouts/v7/modules/Documents/partials/SidebarEssentials.tpl
+ 40
− 53
View file @ f2805d75
...@@ -19,9 +19,7 @@ ...@@ -19,9 +19,7 @@
<div> <div>
<input class="search-list" type="text" placeholder="Search for List"> <input class="search-list" type="text" placeholder="Search for List">
</div> </div>
<div class="menu-scroller mCustomScrollBox" data-mcs-theme="dark"> <div class="menu-scroller scrollContainer" style="position:relative; top:0; left:0;">
<div class="mCustomScrollBox mCS-light-2 mCSB_inside" tabindex="0">
<div class="mCSB_container" style="position:relative; top:0; left:0;">
<div class="list-menu-content"> <div class="list-menu-content">
{if $CUSTOM_VIEWS && count($CUSTOM_VIEWS) > 0} {if $CUSTOM_VIEWS && count($CUSTOM_VIEWS) > 0}
{foreach key=GROUP_LABEL item=GROUP_CUSTOM_VIEWS from=$CUSTOM_VIEWS} {foreach key=GROUP_LABEL item=GROUP_CUSTOM_VIEWS from=$CUSTOM_VIEWS}
...@@ -36,7 +34,7 @@ ...@@ -36,7 +34,7 @@
{vtranslate('LBL_SHARED_LIST',$MODULE)} {vtranslate('LBL_SHARED_LIST',$MODULE)}
{/if} {/if}
</h6> </h6>
<input type="hidden" name="allCvId" value="{CustomView_Record_Model::getAllFilterByModule($MODULE)->get('cvid')}" /> <input type="hidden" name="allCvId" value="{CustomView_Record_Model::getAllFilterByModule($MODULE)->get('cvid')}" />
<ul class="lists-menu"> <ul class="lists-menu">
{foreach item="CUSTOM_VIEW" from=$GROUP_CUSTOM_VIEWS name="customView"} {foreach item="CUSTOM_VIEW" from=$GROUP_CUSTOM_VIEWS name="customView"}
<li style="font-size:12px;" class='listViewFilter {if $VIEWID eq $CUSTOM_VIEW->getId() && ($CURRENT_TAG eq '') && !$FOLDER_VALUE} active{/if} {if $smarty.foreach.customView.iteration gt 5} filterHidden hide{/if} '> <li style="font-size:12px;" class='listViewFilter {if $VIEWID eq $CUSTOM_VIEW->getId() && ($CURRENT_TAG eq '') && !$FOLDER_VALUE} active{/if} {if $smarty.foreach.customView.iteration gt 5} filterHidden hide{/if} '>
...@@ -91,13 +89,7 @@ ...@@ -91,13 +89,7 @@
<h6 class="lists-header"><center> {vtranslate('LBL_NO')} {vtranslate('Lists')} {vtranslate('LBL_FOUND')} ... </center></h6> <h6 class="lists-header"><center> {vtranslate('LBL_NO')} {vtranslate('Lists')} {vtranslate('LBL_FOUND')} ... </center></h6>
</div> </div>
</div> </div>
</div> </div><div class="sidebar-header clearfix">
</div>
</div>
<div class="list-menu-content">
<div class="list-group">
<div class="sidebar-header clearfix">
<h5 class="pull-left">{vtranslate('LBL_FOLDERS',$MODULE)}</h5> <h5 class="pull-left">{vtranslate('LBL_FOLDERS',$MODULE)}</h5>
<button id="createFolder" class="btn btn-default pull-right sidebar-btn"> <button id="createFolder" class="btn btn-default pull-right sidebar-btn">
<span class="fa fa-plus" aria-hidden="true"></span> <span class="fa fa-plus" aria-hidden="true"></span>
...@@ -107,43 +99,40 @@ ...@@ -107,43 +99,40 @@
<div> <div>
<input class="search-folders" type="text" placeholder="Search for Folders"> <input class="search-folders" type="text" placeholder="Search for Folders">
</div> </div>
<div class="menu-scroller mCustomScrollBox" data-mcs-theme="dark"> <div class="menu-scroller scrollContainer" style="position:relative; top:0; left:0;">
<div class="mCustomScrollBox mCS-light-2 mCSB_inside" tabindex="0"> <div class="list-menu-content">
<div class="mCSB_container" style="position:relative; top:0; left:0;"> <div class="list-group">
<ul id="folders-list" class="lists-menu"> <ul id="folders-list" class="lists-menu">
{foreach item="FOLDER" from=$FOLDERS} {foreach item="FOLDER" from=$FOLDERS}
{assign var=FOLDERNAME value={vtranslate($FOLDER->get('foldername'), $MODULE)}} {assign var=FOLDERNAME value={vtranslate($FOLDER->get('foldername'), $MODULE)}}
<li style="font-size:12px;" class='documentFolder {if $FOLDER_VALUE eq $FOLDER->getName()} active{/if}'> <li style="font-size:12px;" class='documentFolder {if $FOLDER_VALUE eq $FOLDER->getName()} active{/if}'>
<a class="filterName" href="javascript:void(0);" data-filter-id="{$FOLDER->get('folderid')}" data-folder-name="{$FOLDER->get('foldername')}" title="{$FOLDERNAME}"> <a class="filterName" href="javascript:void(0);" data-filter-id="{$FOLDER->get('folderid')}" data-folder-name="{$FOLDER->get('foldername')}" title="{$FOLDERNAME}">
<i class="fa {if $FOLDER_VALUE eq $FOLDER->getName()}fa-folder-open{else}fa-folder{/if}"></i> <i class="fa {if $FOLDER_VALUE eq $FOLDER->getName()}fa-folder-open{else}fa-folder{/if}"></i>
<span class="foldername">{if {$FOLDERNAME|strlen > 40} } {$FOLDERNAME|substr:0:40|@escape:'html'}..{else}{$FOLDERNAME|@escape:'html'}{/if}</span> <span class="foldername">{if {$FOLDERNAME|strlen > 40} } {$FOLDERNAME|substr:0:40|@escape:'html'}..{else}{$FOLDERNAME|@escape:'html'}{/if}</span>
</a> </a>
{if $FOLDER->getName() neq 'Default' && $FOLDER->getName() neq 'Google Drive' && $FOLDER->getName() neq 'Dropbox'} {if $FOLDER->getName() neq 'Default' && $FOLDER->getName() neq 'Google Drive' && $FOLDER->getName() neq 'Dropbox'}
<div class="dropdown pull-right"> <div class="dropdown pull-right">
<span class="fa fa-caret-down dropdown-toggle" data-toggle="dropdown" aria-expanded="true"></span> <span class="fa fa-caret-down dropdown-toggle" data-toggle="dropdown" aria-expanded="true"></span>
<ul class="dropdown-menu dropdown-menu-right vtDropDown" role="menu"> <ul class="dropdown-menu dropdown-menu-right vtDropDown" role="menu">
<li class="editFolder " data-folder-id="{$FOLDER->get('folderid')}"> <li class="editFolder " data-folder-id="{$FOLDER->get('folderid')}">
<a role="menuitem" ><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</a> <a role="menuitem" ><i class="fa fa-pencil-square-o"></i>&nbsp;Edit</a>
</li> </li>
<li class="deleteFolder " data-deletable="{!$FOLDER->hasDocuments()}" data-folder-id="{$FOLDER->get('folderid')}"> <li class="deleteFolder " data-deletable="{!$FOLDER->hasDocuments()}" data-folder-id="{$FOLDER->get('folderid')}">
<a role="menuitem" ><i class="fa fa-trash"></i>&nbsp;Delete</a> <a role="menuitem" ><i class="fa fa-trash"></i>&nbsp;Delete</a>
</li> </li>
</ul> </ul>
</div> </div>
{/if} {/if}
</li> </li>
{/foreach} {/foreach}
<li class="noFolderText" style="display: none;"> <li class="noFolderText" style="display: none;">
<h6 class="lists-header"><center> <h6 class="lists-header"><center>
{vtranslate('LBL_NO')} {vtranslate('LBL_FOLDERS', $MODULE)} {vtranslate('LBL_FOUND')} ... {vtranslate('LBL_NO')} {vtranslate('LBL_FOLDERS', $MODULE)} {vtranslate('LBL_FOUND')} ...
</center></h6> </center></h6>
</li> </li>
</ul> </ul>
</div>
</div>
</div>
</div> </div>
</div> </div></div>
</div> </div>
</div> </div>
...@@ -153,9 +142,7 @@ ...@@ -153,9 +142,7 @@
{vtranslate('LBL_TAGS', $MODULE)} {vtranslate('LBL_TAGS', $MODULE)}
</h4> </h4>
<hr> <hr>
<div class="menu-scroller mCustomScrollBox"> <div class="menu-scroller scrollContainer" style="position:relative; top:0; left:0;">
<div class="mCustomScrollBox mCS-light-2 mCSB_inside" tabindex="0">
<div class="mCSB_container" style="position:relative; top:0; left:0;">
<div class="list-menu-content"> <div class="list-menu-content">
<div id="listViewTagContainer" class="multiLevelTagList" <div id="listViewTagContainer" class="multiLevelTagList"
{if $ALL_CUSTOMVIEW_MODEL} data-view-id="{$ALL_CUSTOMVIEW_MODEL->getId()}" {/if} {if $ALL_CUSTOMVIEW_MODEL} data-view-id="{$ALL_CUSTOMVIEW_MODEL->getId()}" {/if}
...@@ -214,9 +201,9 @@ ...@@ -214,9 +201,9 @@
</button> </button>
</div> </div>
</div> </div>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
\ No newline at end of file
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

Copyright 2023 Vtiger. All rights reserved.