Peter M. Groen / knowledgetree

Commit de9ddfb5d4755be9d86f3d61b20a8ddad7b23812

Authored by Charl Joseph Mert
1 parent b481bfac

Brand server without requiring access to FS 

PT: 1243391

Added cancel button to apply logo form, also padded the preview border to match that of the previous pages border padding.

Updated by: Charl Joseph Mert
Inline Side-by-side
Showing 2 changed files with 4 additions and 13 deletions
plugins/ktcore/admin/manageBranding.php
  View file @de9ddfb
@@ -308,6 +308,7 @@ class ManageBrandDispatcher extends KTAdminDispatcher { @@ -308,6 +308,7 @@ class ManageBrandDispatcher extends KTAdminDispatcher {
308 'label' => _kt('Apply Logo'), 308 'label' => _kt('Apply Logo'),
309 'submit_label' => _kt('Apply'), 309 'submit_label' => _kt('Apply'),
310 'action' => 'apply', 310 'action' => 'apply',
  311 + 'cancel_action' => 'main',
311 'fail_action' => 'main', 312 'fail_action' => 'main',
312 'encoding' => 'multipart/form-data', 313 'encoding' => 'multipart/form-data',
313 'context' => &$this, 314 'context' => &$this,
@@ -329,7 +330,7 @@ class ManageBrandDispatcher extends KTAdminDispatcher { @@ -329,7 +330,7 @@ class ManageBrandDispatcher extends KTAdminDispatcher {
329 'value' => $logoFileName, 330 'value' => $logoFileName,
330 'width' => $this->maxLogoWidth, 331 'width' => $this->maxLogoWidth,
331 'height' => $this->maxLogoHeight, 332 'height' => $this->maxLogoHeight,
332 - 'widgetwidth' => 20 333 + 'div_border' => '1px solid #cccccc'
333 )); 334 ));
334 335
335 // Adding the Hidden FileName Input String 336 // Adding the Hidden FileName Input String
templates/ktcore/forms/widgets/image.smarty
  View file @de9ddfb
1 {if $options.has_div_border} 1 {if $options.has_div_border}
2 -<style>  
3 -.jq_select_image {  
4 - float: left;  
5 - border: {$options.div_border};  
6 - margin-right: 5px;  
7 - padding: 0px;  
8 - display:inline;  
9 - height:70px;  
10 -}  
11 -</style>  
12 <fieldset> 2 <fieldset>
13 <field> 3 <field>
14 <div style="float: left; 4 <div style="float: left;
15 border: {$options.div_border}; 5 border: {$options.div_border};
16 margin-right: 5px; 6 margin-right: 5px;
17 - padding: 0px; 7 + padding: 10px;
18 display:inline; 8 display:inline;
19 - height:70px;"> 9 + height:50px;">
20 {/if} 10 {/if}
21 11
22 <img {if $has_id} id="{$id}" {/if} {if $has_value} src="{$value}"{/if} alt="{$name}" title="{$name}" {if $options.has_width} width="{$options.width}" {/if} {if $options.has_height} height="{$options.height}" {/if}/> 12 <img {if $has_id} id="{$id}" {/if} {if $has_value} src="{$value}"{/if} alt="{$name}" title="{$name}" {if $options.has_width} width="{$options.width}" {/if} {if $options.has_height} height="{$options.height}" {/if}/>