Adding licences for jed

#18 adding force height for more to add scrolling inside blocks
micker · Apr 13, 2015 · 640c871 · 640c871
1 parent a0c28e7
commit 640c871
Show file tree

Hide file tree

Showing 10 changed files with 87 additions and 17 deletions.
diff --git a/assets/css/style.css b/assets/css/style.css
@@ -8,6 +8,10 @@ min-height:155px !important;
 margin-left: -1px !important;
     margin-right: 15px !important;
 }
+.block > .row-striped{
+	overflow-y: auto;
+  overflow-x: hidden;
+}
 .adminlink{
   color:#000;
   font-weight:bold;

diff --git a/elements/flexicategories.php b/elements/flexicategories.php
@@ -1,4 +1,22 @@
 <?php
+/**
+ * @version 1.5 stable $Id: separator.php 1904 2014-05-20 12:21:09Z ggppdk $
+ * @package Joomla
+ * @subpackage FLEXIcontent
+ * @copyright (C) 2009 Emmanuel Danan - www.vistamedia.fr
+ * @license GNU/GPL v2
+ * 
+ * FLEXIcontent is a derivative work of the excellent QuickFAQ component
+ * @copyright (C) 2008 Christoph Lukes
+ * see www.schlu.net for more information
+ *
+ * FLEXIcontent is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+defined('_JEXEC') or die('Restricted access');
+
 jimport( 'joomla.application.component.controller' );
 // Check if component is installed
 if ( !JComponentHelper::isEnabled( 'com_flexicontent', true) ) {

diff --git a/elements/qfcategory.php b/elements/qfcategory.php
@@ -1,4 +1,24 @@
 <?php
+/**
+ * @version 1.5 stable $Id: separator.php 1904 2014-05-20 12:21:09Z ggppdk $
+ * @package Joomla
+ * @subpackage FLEXIcontent
+ * @copyright (C) 2009 Emmanuel Danan - www.vistamedia.fr
+ * @license GNU/GPL v2
+ * 
+ * FLEXIcontent is a derivative work of the excellent QuickFAQ component
+ * @copyright (C) 2008 Christoph Lukes
+ * see www.schlu.net for more information
+ *
+ * FLEXIcontent is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+// Check to ensure this file is included in Joomla!
+defined('_JEXEC') or die('Restricted access');
+
 jimport( 'joomla.application.component.controller' );
 // Check if component is installed
 if ( !JComponentHelper::isEnabled( 'com_flexicontent', true) ) {

diff --git a/elements/separator.php b/elements/separator.php
@@ -18,6 +18,7 @@
 
 // Check to ensure this file is included in Joomla!
 defined('_JEXEC') or die('Restricted access');
+
 jimport( 'joomla.application.component.controller' );
 // Check if component is installed
 if ( !JComponentHelper::isEnabled( 'com_flexicontent', true) ) {

diff --git a/elements/types.php b/elements/types.php
@@ -1,4 +1,24 @@
 <?php
+/**
+ * @version 1.5 stable $Id: separator.php 1904 2014-05-20 12:21:09Z ggppdk $
+ * @package Joomla
+ * @subpackage FLEXIcontent
+ * @copyright (C) 2009 Emmanuel Danan - www.vistamedia.fr
+ * @license GNU/GPL v2
+ * 
+ * FLEXIcontent is a derivative work of the excellent QuickFAQ component
+ * @copyright (C) 2008 Christoph Lukes
+ * see www.schlu.net for more information
+ *
+ * FLEXIcontent is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+// Check to ensure this file is included in Joomla!
+defined('_JEXEC') or die('Restricted access');
+
 jimport( 'joomla.application.component.controller' );
 // Check if component is installed
 if ( !JComponentHelper::isEnabled( 'com_flexicontent', true) ) {

diff --git a/language/en-GB/en-GB.mod_flexiadmin.ini b/language/en-GB/en-GB.mod_flexiadmin.ini
@@ -72,6 +72,8 @@ FLEXI_ADMIN_BUTTON7="Button 7"
 FLEXI_ADMIN_BUTTON8="Button 8"
 FLEXI_ADMIN_BUTTON9="Button 9"
 FLEXI_ADMIN_BUTTON10="Button 10"
+FLEXI_ADMIN_BLOCKHEIGHT="Fixe height"
+FLEXI_ADMIN_BLOCKHEIGHT_DESC="Force height of block ex 200PX. Adding scrolling inside blocks"
 
 
 ;;Custom tab

diff --git a/language/fr-FR/fr-FR.mod_flexiadmin.ini b/language/fr-FR/fr-FR.mod_flexiadmin.ini
@@ -77,6 +77,8 @@ FLEXI_ADMIN_BUTTON7="Bouton 7"
 FLEXI_ADMIN_BUTTON8="Bouton 8"
 FLEXI_ADMIN_BUTTON9="Bouton 9"
 FLEXI_ADMIN_BUTTON10="Bouton 10"
+FLEXI_ADMIN_BLOCKHEIGHT="Hauteur fixe"
+FLEXI_ADMIN_BLOCKHEIGHT_DESC="Insérer une hauteur de block, par exemple 200PX. Cela activera un ascenseur dans vos blocks"
 
 
 

diff --git a/mod_flexiadmin.xml b/mod_flexiadmin.xml
@@ -9,8 +9,8 @@
 	<creationDate>juin 2014</creationDate>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>www.com3elles.com</authorUrl>
-	<version>0.4.0</version>
-	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
+	<version>0.6.0</version>
+	<copyright>Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description>FLEXI_ADMIN_INTRO</description>
 	<files>
@@ -108,6 +108,8 @@
 				<option value="0">FLEXI_NO</option>					
 				<option value="1">FLEXI_YES</option>				
 			</field>
+			<field name="forceheightblock" type="text" default="" size="50" label="FLEXI_ADMIN_BLOCKHEIGHT" description="FLEXI_ADMIN_BLOCKHEIGHT_DESC"/>
+
 			<field name="" type="separator" default="FLEXI_ADMIN_BLOCKCUSTOM_DESC" level="level1" />
 			<field name="" type="separator" default="FLEXI_ADMIN_DBUTTON1" level="level2"/>
 					<field name="displblock1" label="" type="radio" default="0" class="btn-group btn-group-yesno">

diff --git a/mod_flexiadmin.zip b/mod_flexiadmin.zip
diff --git a/tmpl/default.php b/tmpl/default.php
@@ -37,6 +37,7 @@
 $displayadmintab = $params->get('displayadmintab', '1' );
 $displayfreetab  = $params->get('displayfreetab', '1' );
 $displayconfigmodule= $params->get('displayconfigmodule', '1' );
+$forceheightblock= $params->get('forceheightblock', '' );
 
 //id catlist
 $catidlist1       = $params->get('catidlist1', '1' );
@@ -802,7 +803,7 @@ class="modal"
 		<?php
 		echo JText::_( 'FLEXI_ADMIN_ALL' );		
 		echo "</a></div>";	?>		
-			<div class="row-striped">		
+			<div class="row-striped" style="height:<?php echo $forceheightblock; ?>">		
 				<?php foreach ($listPending as $itemPending) : ?>			
 				<div class="row-fluid">				
 					<div class="span13">					
@@ -838,7 +839,7 @@ class="modal"
 		<?php
 		echo JText::_( 'FLEXI_ADMIN_ALL' );		
 		echo "</a></div>";	?>		
-			<div class="row-striped">		
+			<div class="row-striped" style="height:<?php echo $forceheightblock; ?>">		
 				<?php foreach ($listRevised as $itemRevised) : ?>			
 				<div class="row-fluid">
 					<div class="span13">					
@@ -871,7 +872,7 @@ class="modal"
 		<?php
 		echo JText::_( 'FLEXI_ADMIN_ALL' );		
 		echo "</a></div>";	?>		
-			<div class="row-striped">				
+			<div class="row-striped" style="height:<?php echo $forceheightblock; ?>">				
 				<?php foreach ($listInprogress as $itemInprogress) : ?>			
 				<div class="row-fluid">				
 					<div class="span13">					
@@ -903,7 +904,7 @@ class="modal"
 		<?php
 		echo JText::_( 'FLEXI_ADMIN_ALL' );		
 		echo "</a></div>";	?>		
-	<div class="row-striped">		
+	<div class="row-striped" style="height:<?php echo $forceheightblock; ?>">		
 		<?php foreach ($listDraft as $itemDraft) : ?>
 		<div class="row-fluid">		
 			<div class="span13">	
@@ -940,7 +941,7 @@ class="modal"
 		<?php
 		echo JText::_( 'FLEXI_ADMIN_ALL' );		
 		echo "</a></div>";	?>		
-		<div class="row-striped">		
+		<div class="row-striped" style="height:<?php echo $forceheightblock; ?>">		
 			<?php foreach ($listUseritem as $itemUseritem) : ?>		
 			<div class="row-fluid">		
 				<div class="span13">			
@@ -991,7 +992,7 @@ class="modal"
 		<?php
 		echo JText::_( 'FLEXI_ADMIN_ALL' );		
 		echo "</a></div>";	?>		
-		<div class="row-striped">	
+		<div class="row-striped" style="height:<?php echo $forceheightblock; ?>">	
 
 			<?php foreach ($listCustomlist1 as $itemCustomlist1) : ?>		
 			<div class="row-fluid">		
@@ -1029,7 +1030,7 @@ class="modal"
 		<?php
 		echo JText::_( 'FLEXI_ADMIN_ALL' );		
 		echo "</a></div>";	?>		
-		<div class="row-striped">	
+		<div class="row-striped" style="height:<?php echo $forceheightblock; ?>">	
 
 			<?php foreach ($listCustomlist2 as $itemCustomlist2) : ?>		
 			<div class="row-fluid">		
@@ -1067,7 +1068,7 @@ class="modal"
 		<?php
 		echo JText::_( 'FLEXI_ADMIN_ALL' );		
 		echo "</a></div>";	?>		
-		<div class="row-striped">	
+		<div class="row-striped" style="height:<?php echo $forceheightblock; ?>">	
 
 			<?php foreach ($listCustomlist3 as $itemCustomlist3) : ?>		
 			<div class="row-fluid">		
@@ -1105,7 +1106,7 @@ class="modal"
 		<?php
 		echo JText::_( 'FLEXI_ADMIN_ALL' );		
 		echo "</a></div>";	?>		
-		<div class="row-striped">	
+		<div class="row-striped" style="height:<?php echo $forceheightblock; ?>">	
 
 			<?php foreach ($listCustomlist4 as $itemCustomlist4) : ?>		
 			<div class="row-fluid">		
@@ -1143,7 +1144,7 @@ class="modal"
 		<?php
 		echo JText::_( 'FLEXI_ADMIN_ALL' );		
 		echo "</a></div>";	?>		
-		<div class="row-striped">	
+		<div class="row-striped" style="height:<?php echo $forceheightblock; ?>">	
 
 			<?php foreach ($listCustomlist5 as $itemCustomlist5) : ?>		
 			<div class="row-fluid">		
@@ -1181,7 +1182,7 @@ class="modal"
 		<?php
 		echo JText::_( 'FLEXI_ADMIN_ALL' );		
 		echo "</a></div>";	?>		
-		<div class="row-striped">	
+		<div class="row-striped" style="height:<?php echo $forceheightblock; ?>">	
 
 			<?php foreach ($listCustomlist6 as $itemCustomlist6) : ?>		
 			<div class="row-fluid">		
@@ -1219,7 +1220,7 @@ class="modal"
 		<?php
 		echo JText::_( 'FLEXI_ADMIN_ALL' );		
 		echo "</a></div>";	?>		
-		<div class="row-striped">	
+		<div class="row-striped" style="height:<?php echo $forceheightblock; ?>">	
 
 			<?php foreach ($listCustomlist7 as $itemCustomlist7) : ?>		
 			<div class="row-fluid">		
@@ -1257,7 +1258,7 @@ class="modal"
 		<?php
 		echo JText::_( 'FLEXI_ADMIN_ALL' );		
 		echo "</a></div>";	?>		
-		<div class="row-striped">	
+		<div class="row-striped" style="height:<?php echo $forceheightblock; ?>">	
 
 			<?php foreach ($listCustomlist8 as $itemCustomlist8) : ?>		
 			<div class="row-fluid">		
@@ -1295,7 +1296,7 @@ class="modal"
 		<?php
 		echo JText::_( 'FLEXI_ADMIN_ALL' );		
 		echo "</a></div>";	?>		
-		<div class="row-striped">	
+		<div class="row-striped" style="height:<?php echo $forceheightblock; ?>">	
 
 			<?php foreach ($listCustomlist9 as $itemCustomlist9) : ?>		
 			<div class="row-fluid">		
@@ -1333,7 +1334,7 @@ class="modal"
 		<?php
 		echo JText::_( 'FLEXI_ADMIN_ALL' );		
 		echo "</a></div>";	?>		
-		<div class="row-striped">	
+		<div class="row-striped" style="height:<?php echo $forceheightblock; ?>">	
 
 			<?php foreach ($listCustomlist10 as $itemCustomlist10) : ?>		
 			<div class="row-fluid">