From f5b069603937555f1bce6cabd7583a96ebeb2eb4 Mon Sep 17 00:00:00 2001
From: dleffler <dleffler@hughes.net>
Date: Thu, 28 Feb 2013 22:39:05 -0500
Subject: [PATCH] Fixes some attached 'File' display anomalies and adds a new
 box placement of 'Below' content in addition to above, left, & right [#948]

---
 framework/modules/blog/views/blog/blogitem.tpl            | 5 +++--
 framework/modules/blog/views/blog/bloglist.tpl            | 5 +++--
 framework/modules/blog/views/blog/showall_recent.tpl      | 5 +++--
 framework/modules/common/views/configure/files.tpl        | 8 +++++---
 .../common/views/file/configure/Downloadable Files.tpl    | 2 +-
 framework/modules/common/views/file/configure/Gallery.tpl | 2 +-
 framework/modules/news/views/news/newsitem.tpl            | 5 +++--
 framework/modules/news/views/news/newslist.tpl            | 4 ++--
 .../modules/news/views/news/showall_announcement.tpl      | 4 ++--
 framework/modules/news/views/news/showall_recent.tpl      | 4 ++--
 .../modules/portfolio/views/portfolio/portfolioitem.tpl   | 4 ++--
 framework/modules/portfolio/views/portfolio/show.tpl      | 5 +++--
 .../modules/portfolio/views/portfolio/showall_toggle.tpl  | 4 ++--
 framework/modules/text/views/text/showall.tpl             | 5 +++--
 framework/modules/text/views/text/showall_accordion.tpl   | 5 +++--
 framework/modules/text/views/text/showall_inline.tpl      | 5 +++--
 framework/modules/text/views/text/showall_single.tpl      | 5 +++--
 framework/modules/text/views/text/showall_tabbed.tpl      | 4 ++--
 framework/modules/text/views/text/showall_toggle.tpl      | 4 ++--
 framework/plugins/function.control.php                    | 2 +-
 framework/plugins/function.filedisplayer.php              | 4 ++--
 21 files changed, 51 insertions(+), 40 deletions(-)

diff --git a/framework/modules/blog/views/blog/blogitem.tpl b/framework/modules/blog/views/blog/blogitem.tpl
index 16f7a40ebb..b3444e1e69 100644
--- a/framework/modules/blog/views/blog/blogitem.tpl
+++ b/framework/modules/blog/views/blog/blogitem.tpl
@@ -67,14 +67,15 @@
         </div>
     {/permissions}
     <div class="bodycopy">
-        {if $config.filedisplay != "Downloadable Files"}
+        {if $config.ffloat != "Below"}
             {filedisplayer view="`$config.filedisplay`" files=$record->expFile record=$record}
         {/if}
         {$record->body}
-        {if $config.filedisplay == "Downloadable Files"}
+        {if $config.ffloat == "Below"}
             {filedisplayer view="`$config.filedisplay`" files=$record->expFile record=$record}
         {/if}
     </div>
+    {clear}
     {if $record->prev || $record->next}
         <div class="module-actions">
             {clear}
diff --git a/framework/modules/blog/views/blog/bloglist.tpl b/framework/modules/blog/views/blog/bloglist.tpl
index 77798c0fb1..0e010b6abe 100644
--- a/framework/modules/blog/views/blog/bloglist.tpl
+++ b/framework/modules/blog/views/blog/bloglist.tpl
@@ -72,7 +72,7 @@
                 </div>
             {/permissions}
             <div class="bodycopy">
-                {if $config.filedisplay != "Downloadable Files"}
+                {if $config.ffloat != "Below"}
                     {filedisplayer view="`$config.filedisplay`" files=$item->expFile record=$item is_listing=1}
                 {/if}
     			{if $config.usebody==1}
@@ -81,10 +81,11 @@
     			{else}
     				{$item->body}
     			{/if}			
-                {if $config.filedisplay == "Downloadable Files"}
+                {if $config.ffloat == "Below"}
                     {filedisplayer view="`$config.filedisplay`" files=$item->expFile record=$item is_listing=1}
                 {/if}
             </div>
+            {clear}
         </div>
     {/foreach}
     {pagelinks paginate=$page bottom=1}
diff --git a/framework/modules/blog/views/blog/showall_recent.tpl b/framework/modules/blog/views/blog/showall_recent.tpl
index 72aa078dd2..de0a5b144e 100644
--- a/framework/modules/blog/views/blog/showall_recent.tpl
+++ b/framework/modules/blog/views/blog/showall_recent.tpl
@@ -102,7 +102,7 @@
             {/permissions}
             {if $config.usebody!=2}
                 <div class="bodycopy">
-                    {if $config.filedisplay != "Downloadable Files"}
+                    {if $config.ffloat != "Below"}
                         {filedisplayer view="`$config.filedisplay`" files=$item->expFile record=$item is_listing=1}
                     {/if}
                     {if $config.usebody==1}
@@ -111,10 +111,11 @@
                     {else}
                         {$item->body}
                     {/if}
-                    {if $config.filedisplay == "Downloadable Files"}
+                    {if $config.ffloat == "Below"}
                         {filedisplayer view="`$config.filedisplay`" files=$item->expFile record=$item is_listing=1}
                     {/if}
                 </div>
+                {clear}
             {/if}
         </div>
         {/if}
diff --git a/framework/modules/common/views/configure/files.tpl b/framework/modules/common/views/configure/files.tpl
index ed2f1e7115..643b836e80 100755
--- a/framework/modules/common/views/configure/files.tpl
+++ b/framework/modules/common/views/configure/files.tpl
@@ -23,9 +23,11 @@
 </div>
 {control id="filedisplay" type='filedisplay-types' name=filedisplay label="Display Files as"|gettext value=$config.filedisplay}
 <div id="ff-options" style="display:none">
-    {control type="dropdown" name="ffloat" label="File Display Box Float"|gettext items="No Float,Left,Right"|gettxtlist values="No Float,Left,Right" value=$config.ffloat}
-    {control type="text" label="Width of File Display Box"|gettext name="fwidth" value=$config.fwidth size=5}
-    {control type="text" label="Width of Margin"|gettext name="fmargin" value=$config.fmargin size=5}
+    {group label="File Display Box"|gettext}
+        {control type="dropdown" name="ffloat" label="Placement in Relation to Content"|gettext items="Above,Left,Right,Below"|gettxtlist value=$config.ffloat}
+        {control type="text" label="Width of Box"|gettext name="fwidth" value=$config.fwidth size=5}
+        {control type="text" label="Width of Margin"|gettext name="fmargin" value=$config.fmargin size=5}
+    {/group}
 </div>
 <div id="fileViewConfig">
     {if $config.filedisplay != ""}
diff --git a/framework/modules/common/views/file/configure/Downloadable Files.tpl b/framework/modules/common/views/file/configure/Downloadable Files.tpl
index a05cdc555a..099d060bd6 100755
--- a/framework/modules/common/views/file/configure/Downloadable Files.tpl	
+++ b/framework/modules/common/views/file/configure/Downloadable Files.tpl	
@@ -14,5 +14,5 @@
  *}
 
 {group label="Downloadable Files Configuration"|gettext}
-{control type=text name="title" label="File list title"|gettext value=$config.title}
+    {control type=text name="title" label="File list title"|gettext value=$config.title}
 {/group}
\ No newline at end of file
diff --git a/framework/modules/common/views/file/configure/Gallery.tpl b/framework/modules/common/views/file/configure/Gallery.tpl
index e60fbdaeb7..f016b6e28f 100755
--- a/framework/modules/common/views/file/configure/Gallery.tpl
+++ b/framework/modules/common/views/file/configure/Gallery.tpl
@@ -23,7 +23,7 @@
 
 {group label="Image Gallery Configuration"|gettext}
 {control type="checkbox" name="lightbox" label="Lightbox effect"|gettext value=1 checked=$config.lightbox}
-{control type="text" name="piwidth" label="Width of primary image"|gettext|cat:"<small>"|cat:("Setting to 0 will default to <em>Thumbnail Box Size</em> settings"|gettext|cat:"</small>") value=$config.piwidth|default:100 size=5}
+{control type="text" name="piwidth" label="Width of primary image"|gettext value=$config.piwidth|default:100 size=5 description="Setting to 0 will default to <em>Thumbnail Box Size</em> settings"|gettext}
 {control type="checkbox" name="pio" label="Only show primary image on listing pages"|gettext value=1 checked=$config.pio}
 {control type="dropdown" name="floatthumb" label="Float thumbnails"|gettext items="No Float,Left,Right"|gettxtlist values="No Float,Left,Right" value=$config.floatthumb}
 {control type="text" name="thumb" label="Thumbnail box size"|gettext value=$config.thumb|default:100 size=5}
diff --git a/framework/modules/news/views/news/newsitem.tpl b/framework/modules/news/views/news/newsitem.tpl
index bd70c0b6ec..a8eba64c39 100644
--- a/framework/modules/news/views/news/newsitem.tpl
+++ b/framework/modules/news/views/news/newsitem.tpl
@@ -46,14 +46,15 @@
         </div>
     {/permissions}
     <div class="bodycopy">
-        {if $config.filedisplay != "Downloadable Files"}
+        {if $config.ffloat != "Below"}
             {filedisplayer view="`$config.filedisplay`" files=$record->expFile record=$record}
         {/if}
         {$record->body}
-        {if $config.filedisplay == "Downloadable Files"}
+        {if $config.ffloat == "Below"}
             {filedisplayer view="`$config.filedisplay`" files=$record->expFile record=$record}
         {/if}
     </div>
+    {clear}
     {if $record->prev || $record->next}
         <div class="module-actions">
             {clear}
diff --git a/framework/modules/news/views/news/newslist.tpl b/framework/modules/news/views/news/newslist.tpl
index c320a976f8..aadc2acb8a 100644
--- a/framework/modules/news/views/news/newslist.tpl
+++ b/framework/modules/news/views/news/newslist.tpl
@@ -55,7 +55,7 @@
                 {/permissions}
             {/if}
             <div class="bodycopy">
-                {if $config.filedisplay != "Downloadable Files"}
+                {if $config.ffloat != "Below"}
                     {filedisplayer view="`$config.filedisplay`" files=$item->expFile record=$item is_listing=1}
                 {/if}
                 {if $config.usebody==1}
@@ -64,7 +64,7 @@
 				{else}
                     {$item->body}
                 {/if}
-                {if $config.filedisplay == "Downloadable Files"}
+                {if $config.ffloat == "Below"}
                     {filedisplayer view="`$config.filedisplay`" files=$item->expFile record=$item is_listing=1}
                 {/if}
                 <a class="readmore" href="{if $item->isRss}{$item->rss_link}{else}{link action=show title=$item->sef_url}{/if}">{"Read More"|gettext}</a>
diff --git a/framework/modules/news/views/news/showall_announcement.tpl b/framework/modules/news/views/news/showall_announcement.tpl
index 9a42d5b8e5..388e572f3c 100644
--- a/framework/modules/news/views/news/showall_announcement.tpl
+++ b/framework/modules/news/views/news/showall_announcement.tpl
@@ -68,7 +68,7 @@
                 {/permissions}
             {/if}
             <div class="bodycopy">
-                {if $config.filedisplay != "Downloadable Files"}
+                {if $config.ffloat != "Below"}
                     {filedisplayer view="`$config.filedisplay`" files=$item->expFile record=$item is_listing=1}
                 {/if}
                 {if $config.usebody==1}
@@ -77,7 +77,7 @@
 				{else}
                     {$item->body}
                 {/if}
-                {if $config.filedisplay == "Downloadable Files"}
+                {if $config.ffloat == "Below"}
                     {filedisplayer view="`$config.filedisplay`" files=$item->expFile record=$item is_listing=1}
                 {/if}
             </div>
diff --git a/framework/modules/news/views/news/showall_recent.tpl b/framework/modules/news/views/news/showall_recent.tpl
index 84fa42cb86..c488cd4939 100644
--- a/framework/modules/news/views/news/showall_recent.tpl
+++ b/framework/modules/news/views/news/showall_recent.tpl
@@ -83,7 +83,7 @@
                 {/permissions}
             {/if}
             <div class="bodycopy">
-                {if $config.filedisplay != "Downloadable Files"}
+                {if $config.ffloat != "Below"}
                     {filedisplayer view="`$config.filedisplay`" files=$item->expFile record=$item is_listing=1}
                 {/if}
                 {if $config.usebody==1}
@@ -92,7 +92,7 @@
 				{else}
                     {$item->body}
                 {/if}
-                {if $config.filedisplay == "Downloadable Files"}
+                {if $config.ffloat == "Below"}
                     {filedisplayer view="`$config.filedisplay`" files=$item->expFile record=$item is_listing=1}
                 {/if}
                 <a class="readmore" href="{if $item->isRss}{$item->rss_link}{else}{link action=show title=$item->sef_url}{/if}">{"Read More"|gettext}</a>
diff --git a/framework/modules/portfolio/views/portfolio/portfolioitem.tpl b/framework/modules/portfolio/views/portfolio/portfolioitem.tpl
index dab1aeb911..4e29c76721 100644
--- a/framework/modules/portfolio/views/portfolio/portfolioitem.tpl
+++ b/framework/modules/portfolio/views/portfolio/portfolioitem.tpl
@@ -34,7 +34,7 @@
 	{/permissions}
     {tags_assigned record=$record}
     <div class="bodycopy">
-        {if $config.filedisplay != "Downloadable Files"}
+        {if $config.ffloat != "Below"}
             {filedisplayer view="`$config.filedisplay`" files=$record->expFile record=$record is_listing=1}
         {/if}
         {if $config.usebody==1}
@@ -43,7 +43,7 @@
         {else}
             {$record->body}
         {/if}
-        {if $config.filedisplay == "Downloadable Files"}
+        {if $config.ffloat == "Below"}
             {filedisplayer view="`$config.filedisplay`" files=$record->expFile record=$record is_listing=1}
         {/if}
     </div>
diff --git a/framework/modules/portfolio/views/portfolio/show.tpl b/framework/modules/portfolio/views/portfolio/show.tpl
index 4ae059af01..983ad66442 100755
--- a/framework/modules/portfolio/views/portfolio/show.tpl
+++ b/framework/modules/portfolio/views/portfolio/show.tpl
@@ -36,12 +36,13 @@
 	{/permissions}
     {tags_assigned record=$record}
 	<div class="bodycopy">
-        {if $config.filedisplay != "Downloadable Files"}
+        {if $config.ffloat != "Below"}
             {filedisplayer view="`$config.filedisplay`" files=$record->expFile record=$record}
         {/if}
 		{$record->body}
-        {if $config.filedisplay == "Downloadable Files"}
+        {if $config.ffloat == "Below"}
             {filedisplayer view="`$config.filedisplay`" files=$record->expFile record=$record}
         {/if}
 	</div>
+    {clear}
 </div>
diff --git a/framework/modules/portfolio/views/portfolio/showall_toggle.tpl b/framework/modules/portfolio/views/portfolio/showall_toggle.tpl
index 9980a3928e..3d208e44a9 100644
--- a/framework/modules/portfolio/views/portfolio/showall_toggle.tpl
+++ b/framework/modules/portfolio/views/portfolio/showall_toggle.tpl
@@ -81,7 +81,7 @@
             {toggle unique="portfolio`$record->id`" title=$record->title|default:'Click to Hide/View'|gettext collapsed=$config.show_collapsed summary=$config.summary_height summary=$summary}
                 {*<h3{if $config.usecategories} class="{$cat->color}"{/if}><a href="{link action=show title=$record->sef_url}" title="{$record->body|summarize:"html":"para"}">{$record->title}</a></h3>*}
                 <div class="bodycopy">
-                    {if $config.filedisplay != "Downloadable Files"}
+                    {if $config.ffloat != "Below"}
                         {filedisplayer view="`$config.filedisplay`" files=$record->expFile record=$record is_listing=1}
                     {/if}
                     {if $config.usebody==1}
@@ -90,7 +90,7 @@
                     {else}
                         {$record->body}
                     {/if}
-                    {if $config.filedisplay == "Downloadable Files"}
+                    {if $config.ffloat == "Below"}
                         {filedisplayer view="`$config.filedisplay`" files=$record->expFile record=$record is_listing=1}
                     {/if}
                 </div>
diff --git a/framework/modules/text/views/text/showall.tpl b/framework/modules/text/views/text/showall.tpl
index 0dfa65c9d6..174847ad50 100755
--- a/framework/modules/text/views/text/showall.tpl
+++ b/framework/modules/text/views/text/showall.tpl
@@ -49,14 +49,15 @@
 			</div>
         {/permissions}
         <div class="bodycopy">
-            {if $config.filedisplay != "Downloadable Files"}
+            {if $config.ffloat != "Below"}
                 {filedisplayer view="`$config.filedisplay`" files=$text->expFile record=$text}
             {/if}
             {$text->body}
-            {if $config.filedisplay == "Downloadable Files"}
+            {if $config.ffloat == "Below"}
                 {filedisplayer view="`$config.filedisplay`" files=$text->expFile record=$text}
             {/if}
         </div>
+        {clear}
         {permissions}
 			<div class="module-actions">
 				{if $permissions.create == 1}
diff --git a/framework/modules/text/views/text/showall_accordion.tpl b/framework/modules/text/views/text/showall_accordion.tpl
index 39ce7c8f2d..4804a5b566 100644
--- a/framework/modules/text/views/text/showall_accordion.tpl
+++ b/framework/modules/text/views/text/showall_accordion.tpl
@@ -60,14 +60,15 @@
         						</div>
                             {/permissions}
                             <div class="bodycopy">
-                                {if $config.filedisplay != "Downloadable Files"}
+                                {if $config.ffloat != "Below"}
                                     {filedisplayer view="`$config.filedisplay`" files=$text->expFile record=$text}
                                 {/if}
                                 {$text->body}
-                                {if $config.filedisplay == "Downloadable Files"}
+                                {if $config.ffloat == "Below"}
                                     {filedisplayer view="`$config.filedisplay`" files=$text->expFile record=$text}
                                 {/if}
                             </div>
+                            {clear}
         					{permissions}
         						<div class="module-actions">
         							{if $permissions.create == 1}
diff --git a/framework/modules/text/views/text/showall_inline.tpl b/framework/modules/text/views/text/showall_inline.tpl
index 3b65caa7e3..4e9c9d6881 100644
--- a/framework/modules/text/views/text/showall_inline.tpl
+++ b/framework/modules/text/views/text/showall_inline.tpl
@@ -65,15 +65,16 @@
                     </div>
                 {/permissions}
                 <div class="bodycopy">
-                    {if $config.filedisplay != "Downloadable Files"}
+                    {if $config.ffloat != "Below"}
                         {filedisplayer view="`$config.filedisplay`" files=$text->expFile record=$text}
                     {/if}
                     <div id="body-{$text->id}"{$make_edit}>
                         {$text->body}
                     </div>
-                    {if $config.filedisplay == "Downloadable Files"}
+                    {if $config.ffloat == "Below"}
                         {filedisplayer view="`$config.filedisplay`" files=$text->expFile record=$text}
                     {/if}
+                    {clear}
                 </div>
             </div>
         {/foreach}
diff --git a/framework/modules/text/views/text/showall_single.tpl b/framework/modules/text/views/text/showall_single.tpl
index 8d4829a447..61a0c3493d 100644
--- a/framework/modules/text/views/text/showall_single.tpl
+++ b/framework/modules/text/views/text/showall_single.tpl
@@ -35,12 +35,13 @@
         </div>
     {/permissions}
     <div class="bodycopy">
-        {if $config.filedisplay != "Downloadable Files"}
+        {if $config.ffloat != "Below"}
             {filedisplayer view="`$config.filedisplay`" files=$items[0]->expFile record=$items[0]}
         {/if}
         {$items[0]->body}
-        {if $config.filedisplay == "Downloadable Files"}
+        {if $config.ffloat == "Below"}
             {filedisplayer view="`$config.filedisplay`" files=$items[0]->expFile record=$items[0]}
         {/if}
     </div>
+    {clear}
 </div>
diff --git a/framework/modules/text/views/text/showall_tabbed.tpl b/framework/modules/text/views/text/showall_tabbed.tpl
index 59dcb3c838..0b7c0ac30e 100644
--- a/framework/modules/text/views/text/showall_tabbed.tpl
+++ b/framework/modules/text/views/text/showall_tabbed.tpl
@@ -63,11 +63,11 @@
 						</div>
                     {/permissions}
                     <div class="bodycopy">
-                        {if $config.filedisplay != "Downloadable Files"}
+                        {if $config.ffloat != "Below"}
                             {filedisplayer view="`$config.filedisplay`" files=$text->expFile record=$text}
                         {/if}
                         {$text->body}
-                        {if $config.filedisplay == "Downloadable Files"}
+                        {if $config.ffloat == "Below"}
                             {filedisplayer view="`$config.filedisplay`" files=$text->expFile record=$text}
                         {/if}
                     </div>
diff --git a/framework/modules/text/views/text/showall_toggle.tpl b/framework/modules/text/views/text/showall_toggle.tpl
index 8dbcfba384..5430aed2bf 100644
--- a/framework/modules/text/views/text/showall_toggle.tpl
+++ b/framework/modules/text/views/text/showall_toggle.tpl
@@ -55,11 +55,11 @@
         {*{toggle unique="text`$text->id`" title=$text->title|default:'Click to Hide/View'|gettext collapsed=$config.show_collapsed summary=$config.summary_height}*}
         {toggle unique="text`$text->id`" title=$text->title|default:'Click to Hide/View'|gettext collapsed=$config.show_collapsed summary=$summary}
             <div class="bodycopy">
-                {if $config.filedisplay != "Downloadable Files"}
+                {if $config.ffloat != "Below"}
                     {filedisplayer view="`$config.filedisplay`" files=$text->expFile record=$text}
                 {/if}
                 {$text->body}
-                {if $config.filedisplay == "Downloadable Files"}
+                {if $config.ffloat == "Below"}
                     {filedisplayer view="`$config.filedisplay`" files=$text->expFile record=$text}
                 {/if}
             </div>
diff --git a/framework/plugins/function.control.php b/framework/plugins/function.control.php
index ea84a0092f..4112995c3f 100644
--- a/framework/plugins/function.control.php
+++ b/framework/plugins/function.control.php
@@ -105,7 +105,7 @@ function smarty_function_control($params, &$smarty) {
                 break;
             case "filedisplay-types":
                 $control                = new dropdowncontrol();
-                $control->include_blank = gt('-- This modules does not use files --');
+                $control->include_blank = gt('-- This module does not use files --');
                 $control->items         = get_filedisplay_views();
                 break;
             case "dropdown":
diff --git a/framework/plugins/function.filedisplayer.php b/framework/plugins/function.filedisplayer.php
index 52d902fa17..173341f362 100644
--- a/framework/plugins/function.filedisplayer.php
+++ b/framework/plugins/function.filedisplayer.php
@@ -52,8 +52,8 @@ function smarty_function_filedisplayer($params,&$smarty) {
         $params['files'][] = $tmp;
     };
     
-    $float = $config['ffloat']=="No Float"?"":"float:".strtolower($config['ffloat']).";";
-    $width = !empty($config['fwidth'])?$config['fwidth']:"200";
+    $float = ($config['ffloat']=="Above" || $config['ffloat']=="Below") ? "" : "float:".strtolower($config['ffloat']).";";
+    $width = !empty($config['fwidth']) ? $config['fwidth'] : "200";
     
     switch ($config['ffloat']) {
         case 'Left':