actually implement {control type=buttongroup} color & cancel_color su…

…pport which had been used in some views and supported within the buttongroupcontrol for some time
exponentcms · Jan 7, 2017 · 1cfd561 · 1cfd561
1 parent dbd6d7e
commit 1cfd561
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/framework/modules/events/views/event/delete_recurring.tpl b/framework/modules/events/views/event/delete_recurring.tpl
@@ -29,7 +29,7 @@
             <tr>
                 <td colspan="2">
                     {*<input class="{button_style}" type="submit" value="{'Delete Selected'|gettext}" />*}
-                    {control type=buttongroup submit='Delete Selected'|gettext}
+                    {control type=buttongroup submit='Delete Selected'|gettext color=red}
                 </td>
             </tr>
         </table>

diff --git a/framework/modules/file/views/file/deleter.tpl b/framework/modules/file/views/file/deleter.tpl
@@ -69,7 +69,7 @@
                         {/foreach}
                     </tbody>
                 </table>
-                {control type=buttongroup submit="Delete Selected Files"|gettext}
+                {control type=buttongroup submit="Delete Selected Files"|gettext color=red}
             {/form}
         {else}
             {'There don\'t appear to be any missing files'|gettext}

diff --git a/framework/modules/navigation/views/navigation/manage_standalone.tpl b/framework/modules/navigation/views/navigation/manage_standalone.tpl
@@ -59,7 +59,7 @@
                 {/foreach}
             </tbody>
         </table>
-        {control class=delete type=buttongroup submit="Delete Selected Pages"|gettext onclick="return confirm('"|cat:("Are you sure you want to delete these pages?"|gettext)|cat:"');"}
+        {control class=delete type=buttongroup submit="Delete Selected Pages"|gettext color=red onclick="return confirm('"|cat:("Are you sure you want to delete these pages?"|gettext)|cat:"');"}
     {/form}
 </div>
 

diff --git a/framework/modules/photoalbum/views/photo/delete_multi.tpl b/framework/modules/photoalbum/views/photo/delete_multi.tpl
@@ -41,7 +41,7 @@
                 {pagelinks paginate=$page bottom=1}
                 <a class="selectall" href="#" id="sa_conts" onclick="selectAll(1); return false;">{"Select All"|gettext}</a> / <a class="selectnone" href="#" id="sn_conts" onclick="selectAll(0); return false;">{"Select None"|gettext}</a>
                 {br}{br}
-                {control type=buttongroup submit="Delete Selected Photo Items"|gettext cancel="Cancel"|gettext}
+                {control type=buttongroup submit="Delete Selected Photo Items"|gettext color=red cancel="Cancel"|gettext}
             {/form}
         </ul>
     </div>

diff --git a/framework/plugins/function.control.php b/framework/plugins/function.control.php
@@ -533,6 +533,8 @@ function smarty_function_control($params, &$smarty) {
         //if (isset($params['value'])) $control->default = $params['value'];
         if (isset($params['caption'])) $control->caption = $params['caption'];
         if (isset($params['description'])) $control->description = $params['description'];
+        if (isset($params['color'])) $control->color = $params['color'];
+        if (isset($params['cancel_color'])) $control->cancel_color = $params['cancel_color'];
         if (isset($params['size'])) $control->size = $params['size'];
         if (isset($params['nowrap'])) $control->nowrap = "nowrap";
         if (isset($params['flip'])) $control->flip = $params['flip'];