Merge branch 'prega' into 'master'

Fixes #512 - vt7 - More in sidebar menu is static defined

Fixes #737 - vt71 - cannot create records for many modules

Fixes #512 - vt7 - More in sidebar menu is static defined

See merge request !286

layouts/v7/modules/Calendar/partials/SidebarHeader.tpl

@@ -6,13 +6,8 @@
 * Portions created by vtiger are Copyright (C) vtiger.
 * All Rights Reserved.
 ************************************************************************************}
-{assign var="APP_IMAGE_MAP" value=[
-	'MARKETING' => 'fa-users',
-	'SALES' => 'fa-dot-circle-o',
-	'SUPPORT' => 'fa-life-ring',
-	'INVENTORY' => 'vicon-inventory',
-	'PROJECT' => 'fa-briefcase'
-]}
+
+{assign var=APP_IMAGE_MAP value=Vtiger_MenuStructure_Model::getAppIcons()}
 <div class="col-sm-12 col-xs-12 app-indicator-icon-container app-{$SELECTED_MENU_CATEGORY}">
 	<div class="row" title="{strtoupper(vtranslate("LBL_CALENDAR",$MODULE))}">
 		<span class="app-indicator-icon fa fa-calendar"></span>

layouts/v7/modules/Documents/partials/SidebarHeader.tpl

@@ -6,13 +6,8 @@
 * Portions created by vtiger are Copyright (C) vtiger.
 * All Rights Reserved.
 ************************************************************************************}
-{assign var="APP_IMAGE_MAP" value=[
-   'MARKETING' => 'fa-users',
-   'SALES' => 'fa-dot-circle-o',
-   'SUPPORT' => 'fa-life-ring',
-   'INVENTORY' => 'vicon-inventory',
-   'PROJECT' => 'fa-briefcase'
-]}
+
+{assign var=APP_IMAGE_MAP value=Vtiger_MenuStructure_Model::getAppIcons()}
 <div class="col-sm-12 col-xs-12 app-indicator-icon-container app-{$SELECTED_MENU_CATEGORY} moduleIcon">
     <div class="row" title="{vtranslate("Documents",$MODULE)}">
 		<span class="app-indicator-icon fa vicon-documents"></span>

layouts/v7/modules/Portal/IndexViewPreProcess.tpl

@@ -6,9 +6,8 @@
 * Portions created by vtiger are Copyright (C) vtiger.
 * All Rights Reserved.
 ************************************************************************************}
-{* modules/Vtiger/views/Index.php *}
 
-{* START YOUR IMPLEMENTATION FROM BELOW. Use {debug} for information *}
+{strip}
 	{include file="modules/Vtiger/partials/Topbar.tpl"}
 
 	<div class="container-fluid app-nav">
@@ -25,5 +24,10 @@
 		</div>
 	</div>  
 	<div class="main-container main-container-{$MODULE}">
-
+		<div id="modnavigator" class="module-nav">
+			<div class="hidden-xs hidden-sm mod-switcher-container">
+				{include file="partials/Menubar.tpl"|vtemplate_path:$MODULE}
+			</div>
+		</div>
 		<div class="listViewPageDiv content-area full-width" id="listViewContent">
+{/strip}
\ No newline at end of file

layouts/v7/modules/Portal/ListViewHeader.tpl

@@ -10,6 +10,5 @@
 
 {* START YOUR IMPLEMENTATION FROM BELOW. Use {debug} for information *}
 {strip}
-    <div class="col-sm-12 col-xs-12" id="portalListViewPage">
-
-        {strip}
\ No newline at end of file
+    <div id="portalListViewPage">
+{/strip}
\ No newline at end of file

layouts/v7/modules/Portal/SidebarHeader.tpl

@@ -6,13 +6,8 @@
 * Portions created by vtiger are Copyright (C) vtiger.
 * All Rights Reserved.
 ************************************************************************************}
-{assign var="APP_IMAGE_MAP" value=[
-    'MARKETING' => 'fa-users',
-    'SALES' => 'fa-dot-circle-o',
-    'SUPPORT' => 'fa-life-ring',
-    'INVENTORY' => 'vicon-inventory',
-    'PROJECT' => 'fa-briefcase'
- ]}
+
+{assign var=APP_IMAGE_MAP value=Vtiger_MenuStructure_Model::getAppIcons()}
 <div class="col-sm-12 col-xs-12 app-indicator-icon-container app-{$SELECTED_MENU_CATEGORY}">
     <div class="row" title="{vtranslate("Portal",$MODULE)}">
         <span class="app-indicator-icon fa fa-desktop"></span>

layouts/v7/modules/Reports/partials/SidebarHeader.tpl

@@ -6,13 +6,8 @@
 * Portions created by vtiger are Copyright (C) vtiger.
 * All Rights Reserved.
 ************************************************************************************}
-{assign var="APP_IMAGE_MAP" value=[
-   'MARKETING' => 'fa-users',
-   'SALES' => 'fa-dot-circle-o',
-   'SUPPORT' => 'fa-life-ring',
-   'INVENTORY' => 'vicon-inventory',
-   'PROJECT' => 'fa-briefcase'
-]}
+
+{assign var=APP_IMAGE_MAP value=Vtiger_MenuStructure_Model::getAppIcons()}
 
 <div class="col-sm-12 col-xs-12 app-indicator-icon-container app-{$SELECTED_MENU_CATEGORY}">
     <div class="row" title="{strtoupper(vtranslate($MODULE, $MODULE))}">

layouts/v7/modules/Rss/ListViewContents.tpl

@@ -25,13 +25,11 @@
 				<div class="feedContainer">
 					{if $RECORD}
 						<input id="recordId" type="hidden" value="{$RECORD->getId()}">
-            <div class="row-fluid">
+						<div class="row-fluid detailViewButtoncontainer">
 							<span class="btn-toolbar pull-right">
 								<span class="btn-group">
-                        <button id="deleteButton" class="btn btn-default">&nbsp;<strong>{vtranslate('LBL_DELETE', $MODULE)}</strong></button>
-                    </span>
-                    <span class="btn-group">
-                        <button id="makeDefaultButton" class="btn btn-default">&nbsp;<strong>{vtranslate('LBL_SET_AS_DEFAULT', $MODULE)}</strong></button>
+									<button id="deleteButton" class="btn btn-default">&nbsp;{vtranslate('LBL_DELETE', $MODULE)}</button>
+									<button id="makeDefaultButton" class="btn btn-default">&nbsp;{vtranslate('LBL_SET_AS_DEFAULT', $MODULE)}</button>
 								</span>
 							</span>
 							<span class="row-fluid" id="rssFeedHeading">

layouts/v7/modules/Rss/partials/SidebarHeader.tpl

@@ -6,13 +6,8 @@
 * Portions created by vtiger are Copyright (C) vtiger.
 * All Rights Reserved.
 ************************************************************************************}
-{assign var="APP_IMAGE_MAP" value=[
-   'MARKETING' => 'fa-users',
-   'SALES' => 'fa-dot-circle-o',
-   'SUPPORT' => 'fa-life-ring',
-   'INVENTORY' => 'vicon-inventory',
-   'PROJECT' => 'fa-briefcase'
-]}
+
+{assign var=APP_IMAGE_MAP value=Vtiger_MenuStructure_Model::getAppIcons()}
 <div id="appnavigator" class="col-sm-12 col-xs-12 app-switcher-container app-{$SELECTED_MENU_CATEGORY}">
     <a id="menu-toggle" class="menu-toggle" href="#">
         <span class="icon-bar"></span>

layouts/v7/modules/Settings/ExtensionStore/partials/SidebarHeader.tpl

@@ -6,14 +6,8 @@
 * Portions created by vtiger are Copyright (C) vtiger.
 * All Rights Reserved.
 ************************************************************************************}
-{assign var="APP_IMAGE_MAP" value=[
-    'MARKETING' => 'fa-users',
-    'SALES' => 'fa-dot-circle-o',
-    'SUPPORT' => 'fa-life-ring',
-    'INVENTORY' => 'vicon-inventory',
-    'PROJECT' => 'fa-briefcase'
- ]}
 
+{assign var=APP_IMAGE_MAP value=Vtiger_MenuStructure_Model::getAppIcons()}
 <div class="col-sm-12 col-xs-12 app-indicator-icon-container extensionstore app-{$SELECTED_MENU_CATEGORY}"> 
     <div class="row" title="{vtranslate('LBL_EXTENSION_STORE', 'Settings:ExtensionStore')}"> 
         <span class="app-indicator-icon cursorPointer fa fa-shopping-cart"></span> 

layouts/v7/modules/Settings/MenuEditor/Index.tpl

@@ -9,13 +9,7 @@
 {* modules/Settings/MenuEditor/views/Index.php *}
 
 {* START YOUR IMPLEMENTATION FROM BELOW. Use {debug} for information *}
-{assign var="APP_IMAGE_MAP" value=[
-	'MARKETING' => 'fa-users',
-	'SALES' => 'fa-dot-circle-o',
-	'INVENTORY' => 'vicon-inventory',
-	'SUPPORT' => 'fa-life-ring',
-	'PROJECT' => 'fa-briefcase'
-]}
+{assign var=APP_IMAGE_MAP value=Vtiger_MenuStructure_Model::getAppIcons()}
 <div class="listViewPageDiv detailViewContainer col-sm-12" id="listViewContent">
 	<div class="col-sm-12">
 		<div class="row">

layouts/v7/modules/Settings/Vtiger/SidebarHeader.tpl

@@ -6,13 +6,8 @@
 * Portions created by vtiger are Copyright (C) vtiger.
 * All Rights Reserved.
 ************************************************************************************}
-{assign var="APP_IMAGE_MAP" value=[
-   'MARKETING' => 'fa-users',
-   'SALES' => 'fa-dot-circle-o',
-   'SUPPORT' => 'fa-life-ring',
-   'INVENTORY' => 'vicon-inventory',
-   'PROJECT' => 'fa-briefcase'
-]}
+
+{assign var=APP_IMAGE_MAP value=Vtiger_MenuStructure_Model::getAppIcons()}
 <div class="col-sm-12 col-xs-12 app-indicator-icon-container app-{$SELECTED_MENU_CATEGORY}">
     <div class="row" title="{vtranslate("LBL_SETTINGS",$MODULE)}">
         <span class="app-indicator-icon fa fa-cog"></span>

layouts/v7/modules/Users/UsersSidebarHeader.tpl

@@ -6,13 +6,8 @@
 * Portions created by vtiger are Copyright (C) vtiger.
 * All Rights Reserved.
 ************************************************************************************}
-{assign var="APP_IMAGE_MAP" value=[
-   'MARKETING' => 'fa-users',
-   'SALES' => 'fa-dot-circle-o',
-   'SUPPORT' => 'fa-life-ring',
-   'INVENTORY' => 'vicon-inventory',
-   'PROJECT' => 'fa-briefcase'
-]}
+
+{assign var=APP_IMAGE_MAP value=Vtiger_MenuStructure_Model::getAppIcons()}
 <div class="col-sm-12 col-xs-12 app-indicator-icon-container app-{$SELECTED_MENU_CATEGORY}">
     <div class="row" title="{vtranslate("LBL_SETTINGS",$MODULE)}">
         <span class="app-indicator-icon cursorPointer fa fa-cog"></span>

layouts/v7/modules/Vtiger/partials/Sidebar.tpl

@@ -8,12 +8,7 @@
 ************************************************************************************}
 
 {strip}
-	{assign var="APP_IMAGE_MAP" value=[	'MARKETING' => 'fa-users',
-										'SALES' => 'fa-dot-circle-o',
-										'SUPPORT' => 'fa-life-ring',
-										'INVENTORY' => 'vicon-inventory',
-										'PROJECT' => 'fa-briefcase'
-]}
+	{assign var=APP_IMAGE_MAP value=Vtiger_MenuStructure_Model::getAppIcons()}
 	<div id="sidebar" class="col-lg-3">
 		<div id="appnavigator" class="row app-nav">
 			<div class="col-sm-12 col-xs-12 app-switcher-container app-{$SELECTED_MENU_CATEGORY}">

layouts/v7/modules/Vtiger/partials/SidebarAppMenu.tpl

@@ -90,59 +90,6 @@
 					</div>
 				{/if}
 			{/if}
-			<div class="dropdown app-modules-dropdown-container dropdown-compact">
-				{foreach item=APP_MENU_MODEL from=$APP_GROUPED_MENU.$APP_NAME}
-					{assign var=FIRST_MENU_MODEL value=$APP_MENU_MODEL}
-					{if $APP_MENU_MODEL}
-						{break}
-					{/if}
-				{/foreach}
-				<div class="menu-item app-item dropdown-toggle app-item-misc" data-app-name="TOOLS" id="TOOLS_modules_dropdownMenu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
-					<div class="menu-items-wrapper app-menu-items-wrapper">
-						<span class="app-icon-list fa fa-ellipsis-h"></span>
-						<span class="app-name textOverflowEllipsis"> {vtranslate("LBL_MORE")}</span>
-						<span class="fa fa-chevron-right pull-right"></span>
-					</div>
-				</div>
-				<ul class="dropdown-menu app-modules-dropdown dropdown-modules-compact" aria-labelledby="{$APP_NAME}_modules_dropdownMenu" data-height="0.34">
-					{assign var=EMAILTEMPLATES_MODULE_MODEL value=Vtiger_Module_Model::getInstance('EmailTemplates')}
-					{if $EMAILTEMPLATES_MODULE_MODEL && $USER_PRIVILEGES_MODEL->hasModulePermission($EMAILTEMPLATES_MODULE_MODEL->getId())}
-						<li>
-							<a href="{$EMAILTEMPLATES_MODULE_MODEL->getDefaultUrl()}">
-								<span class="fa module-icon">{$EMAILTEMPLATES_MODULE_MODEL->getModuleIcon()}</span>
-								<span class="module-name textOverflowEllipsis"> {vtranslate($EMAILTEMPLATES_MODULE_MODEL->getName(), $EMAILTEMPLATES_MODULE_MODEL->getName())}</span>
-							</a>
-						</li>
-					{/if}
-					{assign var=RECYCLEBIN_MODULE_MODEL value=Vtiger_Module_Model::getInstance('RecycleBin')}
-					{if $RECYCLEBIN_MODULE_MODEL && $USER_PRIVILEGES_MODEL->hasModulePermission($RECYCLEBIN_MODULE_MODEL->getId())}
-						<li>
-							<a href="{$RECYCLEBIN_MODULE_MODEL->getDefaultUrl()}">
-								<span class="fa fa-trash module-icon"></span>
-								<span class="module-name textOverflowEllipsis"> {vtranslate('Recycle Bin')}</span>
-							</a>
-						</li>
-					{/if}
-					{assign var=RSS_MODULE_MODEL value=Vtiger_Module_Model::getInstance('Rss')}
-					{if $RSS_MODULE_MODEL && $USER_PRIVILEGES_MODEL->hasModulePermission($RSS_MODULE_MODEL->getId())}
-						<li>
-							<a href="index.php?module=Rss&view=List">
-								<span class="fa fa-rss module-icon"></span>
-								<span class="module-name textOverflowEllipsis">{vtranslate($RSS_MODULE_MODEL->getName(), $RSS_MODULE_MODEL->getName())}</span>
-							</a>
-						</li>
-					{/if}
-					{assign var=PORTAL_MODULE_MODEL value=Vtiger_Module_Model::getInstance('Portal')}
-					{if $PORTAL_MODULE_MODEL && $USER_PRIVILEGES_MODEL->hasModulePermission($PORTAL_MODULE_MODEL->getId())}
-						<li>
-							<a href="index.php?module=Portal&view=List">
-								<span class="fa fa-desktop module-icon"></span>
-								<span class="module-name textOverflowEllipsis"> {vtranslate('Portal')}</span>
-							</a>
-						</li>
-					{/if}
-				</ul>
-			</div>
 			{if $USER_MODEL->isAdminUser()}
 				<div class="dropdown app-modules-dropdown-container dropdown-compact">
 					<div class="menu-item app-item dropdown-toggle app-item-misc" data-app-name="TOOLS" id="TOOLS_modules_dropdownMenu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" data-default-url="{if $USER_MODEL->isAdminUser()}index.php?module=Vtiger&parent=Settings&view=Index{else}index.php?module=Users&view=Settings{/if}">

layouts/v7/modules/Vtiger/partials/SidebarHeader.tpl

@@ -7,13 +7,7 @@
 * All Rights Reserved.
 ************************************************************************************}
 
-{assign var="APP_IMAGE_MAP" value=[
-	'MARKETING' => 'fa-users',
-	'SALES' => 'fa-dot-circle-o',
-	'SUPPORT' => 'fa-life-ring',
-	'INVENTORY' => 'vicon-inventory',
-	'PROJECT' => 'fa-briefcase'
- ]}
+{assign var=APP_IMAGE_MAP value=Vtiger_MenuStructure_Model::getAppIcons()}
 
 <div class="col-sm-12 col-xs-12 app-indicator-icon-container app-{$SELECTED_MENU_CATEGORY}">
 	<div class="row" title="{if $MODULE eq 'Home' || !$MODULE} {vtranslate('LBL_DASHBOARD')} {else}{$SELECTED_MENU_CATEGORY}{/if}">

layouts/v7/modules/Vtiger/partials/Topbar.tpl

@@ -10,12 +10,7 @@
 {strip}
 	{include file="modules/Vtiger/Header.tpl"}
 
-	{assign var="APP_IMAGE_MAP" value=[	'MARKETING' => 'fa-users',
-										'SALES' => 'fa-dot-circle-o',
-										'SUPPORT' => 'fa-life-ring',
-										'INVENTORY' => 'vicon-inventory',
-										'PROJECT' => 'fa-briefcase' ]}
-
+	{assign var=APP_IMAGE_MAP value=Vtiger_MenuStructure_Model::getAppIcons()}
 	<nav class="navbar navbar-default navbar-fixed-top app-fixed-navbar">
 		<div class="container-fluid global-nav">
 			<div class="row">

layouts/v7/skins/vtiger/style.less

@@ -453,6 +453,10 @@ body{
     background: @project_app !important;
 }
 
+.app-TOOLS {
+	background: @marketing_app !important;
+}
+
 .app-DEFAULT, .app-DASHBOARD {
     background: @default_app !important;
 }
@@ -604,6 +608,11 @@ a.menu-item:hover{
 .app-item-color-PROJECT {
     border-left: 4px solid @project_app;
 }
+
+.app-item-color-TOOLS {
+	border-left: 4px solid @marketing_app;
+}
+
 .app-item .fa{
     font-size: 1.5em;
     -webkit-transition: all 0.25s ease-in;
@@ -1234,7 +1243,6 @@ input[type="password"].inputElement{
     background-color: @white;
     border: 1px solid @lightColorBorder;
     margin:5px 0 10px;
-    color: #ccc;
     padding: 5px 10px;
 }
 .search-folders:focus,
@@ -2020,8 +2028,7 @@ strong, b, th{
     margin-top: 3%;
     margin-right: 2%;
 }
-
-overlayDetailHeader button.btn {
+.overlayDetailHeader button.btn {
 	margin: 0px 1px !important;
 }
 
@@ -7388,23 +7395,6 @@ a.cp-modules:hover{
     padding: 3px;
 }
 
-.main-container-Documents .module-nav,
-.main-container-RecycleBin .module-nav,
-.main-container-Reports .module-nav {
-    width: 0;
-}
-.main-container-Documents .sidebar-essentials,
-.main-container-RecycleBin .sidebar-essentials,
-.main-container-Reports .sidebar-essentials {
-    width: 283px;
-    left: 0;
-}
-.main-container-Documents .full-width,
-.main-container-RecycleBin .full-width,
-.main-container-Reports .full-width,
-.main-container-Portal .full-width {
-    padding-left: 0px !important;
-}
 .main-container-MailManager .module-nav {
     width: 230px;
 }
@@ -7522,25 +7512,20 @@ li.select2-search-choice div{
     border-left: 1px solid @lightColorBorder;
 }
 .main-container-Documents .module-nav,
-.main-container-RecycleBin .module-nav,
 .main-container-Reports .module-nav {
     width: 0;
 }
 .main-container-Documents .mod-switcher-container,
-.main-container-RecycleBin .mod-switcher-container,
 .main-container-Reports .mod-switcher-container {
     width: 0;
 }
 .main-container-Documents .sidebar-essentials,
-.main-container-RecycleBin .sidebar-essentials,
 .main-container-Reports .sidebar-essentials {
     width: 283px;
     left: 0;
 }
 .main-container-Documents .full-width,
-.main-container-RecycleBin .full-width,
-.main-container-Reports .full-width,
-.main-container-Portal .full-width {
+.main-container-Reports .full-width {
     padding-left: 0px !important;
 }
 

modules/Migration/schema/660_to_700.php

@@ -2174,6 +2174,7 @@ if(defined('VTIGER_UPGRADE')) {
 		}
 	}
 
+	$skippedTablesForAll = array('vtiger_crmentity_user_field');
 	$skippedTables = array('Calendar' => array('vtiger_seactivityrel', 'vtiger_cntactivityrel', 'vtiger_salesmanactivityrel'));
 	$allEntityModules = Vtiger_Module_Model::getEntityModules();
 	$dbName = $db->dbName;
@@ -2202,6 +2203,9 @@ if(defined('VTIGER_UPGRADE')) {
 				if ($skippedTables[$moduleName]) {
 					$relatedTables = array_diff_key($relatedTables, array_flip($skippedTables[$moduleName]));
 				}
+				if ($skippedTablesForAll) {
+					$relatedTables = array_diff_key($relatedTables, array_flip($skippedTablesForAll));
+				}
 
 				//Checking foriegn key with base table
 				foreach ($relatedTables as $tableName => $index) {

modules/Migration/schema/701_to_710.php

@@ -215,6 +215,19 @@ if (defined('VTIGER_UPGRADE')) {
 	echo '<br>Succesfully centralize user field table for easy query with context of user across module<br>';
 	//END::Centralize user field table for easy query with context of user across module
 
+	//START::Adding new parent TOOLS in menu
+	$appsList = array('TOOLS' => array('Rss', 'Portal'));
+	foreach ($appsList as $app => $appModules) {
+		foreach ($appModules as $moduleName) {
+			$moduleModel = Vtiger_Module_Model::getInstance($moduleName);
+			if ($moduleModel) {
+				Settings_MenuEditor_Module_Model::addModuleToApp($moduleName, $app);
+			}
+		}
+	}
+	echo '<br>Succesfully added RSS, Email Templates for new parent TOOLS<br>';
+	//END::Adding new parent TOOLS in menu
+
 	//Update existing package modules
 	Install_Utils_Model::installModules();
 

modules/Vtiger/models/MenuStructure.php

@@ -161,7 +161,7 @@ class Vtiger_MenuStructure_Model extends Vtiger_Base_Model {
 	}
 
 	public static function getIgnoredModules() {
-		return array('Calendar', 'Documents', 'MailManager', 'Rss', 'Portal', 'RecycleBin', 'SMSNotifier', 'EmailTemplates', 'Reports');
+		return array('Calendar', 'Documents', 'MailManager', 'SMSNotifier', 'Reports');
 	}
 
 	function regroupMenuByParent($menuGroupedByParent) {
@@ -215,7 +215,8 @@ class Vtiger_MenuStructure_Model extends Vtiger_Base_Model {
 							'MARKETING_AND_SALES'	=> 'MARKETING',
 							'INVENTORY'				=> 'INVENTORY',
 							'SUPPORT'				=> 'SUPPORT',
-							'TOOLS'					=> 'PROJECT'
+							'PROJECT'				=> 'PROJECT',
+							'TOOLS'					=> 'TOOLS'
 						  );
 		return $oldToNewAppMap;
 	}
@@ -225,6 +226,17 @@ class Vtiger_MenuStructure_Model extends Vtiger_Base_Model {
 	 * @return <array>
 	 */
 	public static function getAppMenuList(){
-		return array('MARKETING','SALES','INVENTORY','SUPPORT','PROJECT');
+		return array('MARKETING','SALES','INVENTORY','SUPPORT','PROJECT','TOOLS');
+	}
+
+	public static function getAppIcons() {
+		$appImageIcons = array(	'MARKETING' => 'fa-users',
+								'SALES'		=> 'fa-dot-circle-o',
+								'SUPPORT'	=> 'fa-life-ring',
+								'INVENTORY'	=> 'vicon-inventory',
+								'PROJECT'	=> 'fa-briefcase',
+								'TOOLS'		=> 'fa-wrench'
+							);
+		return $appImageIcons;
 	}
 }