fixed beta 1 bugs, 31062, 31063, 31101, 31067, 31065

[com.zyxware.civiwci.git] / templates / CRM / Wci / Page / wciwidget.tpl

diff --git a/templates/CRM/Wci/Page/wciwidget.tpl b/templates/CRM/Wci/Page/wciwidget.tpl
index 8374bbce39b6eb01aa7dd0ebb97336bb5bfc1158..50c569de725002bad9be4416d96a1c08da91b0bd 100644 (file)
--- a/templates/CRM/Wci/Page/wciwidget.tpl
+++ b/templates/CRM/Wci/Page/wciwidget.tpl
@@ -4,19 +4,22 @@
         font-size:12px;
         font-family:Helvetica, Arial, sans;
         padding:6px;
-        -moz-border-radius:       4px;
-        -webkit-border-radius:   4px;
-        -khtml-border-radius:   4px;
-        border-radius:      4px;
-
-        {/literal}{if (0 == $wciform.hide_border)}{literal}
-          border: 4px solid {/literal}{$wciform.color_border}{literal};
-        {if (1 == $wciform.hide_border)}
-          border: None;
-        {/literal}{/if}{literal}
+        -moz-border-radius: 12px;
+        -webkit-border-radius: 12px;
+        -khtml-border-radius: 12px;
+        border-radius: 12px;
+    }
+    .crm-wci-widget-border {
+        border: 4px solid {/literal}{$wciform.color_border}{literal};
         background-color: {/literal}{$wciform.color_widget_bg}{literal}; /* background color */
     }
     
+    .crm-wci-widget hr {
+      text-align:center;
+      display: block; height: 1px;
+      border: 0; border-top: 1px solid {/literal}{$wciform.color_border}{literal};
+      margin: 1em 0; padding: 0;
+    }
     .crm-wci-widget.thin {
       width: 150px;
     }
@@ -29,7 +32,7 @@
       width: 250px;
     }
     
-    h5 {
+    .crm-wci-widget h5 {
         font-size:14px;
         padding:3px;
         margin: 0px;
@@ -150,6 +153,13 @@
       text-align: center;
       margin: 0 auto;
     }
+    input.btnNL, button.btnNL {
+       color:{/literal}{$wciform.color_btn_newsletter}{literal};
+       background:{/literal}{$wciform.color_btn_newsletter_bg}{literal};
+    }
+    #newsletter_msg {
+      color:{/literal}{$wciform.color_newsletter_text}{literal};
+    }
 </style>
 
 <style>
@@ -158,14 +168,19 @@
 {literal}
 </style>
 {/literal}
+
+{if (1 == $wciform.hide_border)}
 <div id="crm_wid_{$wciform.widgetId}" class="crm-wci-widget {$wciform.size_variant}">
-  {if $wciform.title && (false == $wciform.hide_title)}
-    <h5 id="crm_wid_{$wciform.widgetId}_title">
+{else}
+<div id="crm_wid_{$wciform.widgetId}" class="crm-wci-widget crm-wci-widget-border {$wciform.size_variant}">
+{/if}
       {if $wciform.logo_image}
         <span class="crm-logo">
           <img src="{$wciform.logo_image}" alt={ts}Logo{/ts}>
         </span>
       {/if}
+  {if $wciform.title && (false == $wciform.hide_title)}
+    <h5 id="crm_wid_{$wciform.widgetId}_title">
       {$wciform.title}
     </h5>
   {/if}
@@ -176,8 +191,8 @@
     {/if}
     {if (false == $wciform.hide_pbcap)}
     <div class="crm-amounts">
-        <div id="crm_wid_{$wciform.widgetId}_amt_hi" class="crm-amount-high">{$wciform.goal_amount}</div>
-        <div id="crm_wid_{$wciform.widgetId}_amt_low" class="crm-amount-low">{$wciform.starting_amount}</div>
+        <div id="crm_wid_{$wciform.widgetId}_amt_hi" class="crm-amount-high">${$wciform.goal_amount}</div>
+        <div id="crm_wid_{$wciform.widgetId}_amt_low" class="crm-amount-low">${$wciform.starting_amount}</div>
         <div id="crm_wid_{$wciform.widgetId}_percentage" class="crm-percentage">{$wciform.pb_percentage}%</div>
     </div>
     {/if}
@@ -191,26 +206,29 @@
     </div>
     <div id="crm_wid_{$wciform.widgetId}_campaign" class="crm-campaign">
     </div>
-    {if $wciform.button_title}
+    {if $wciform.button_title && $cpageId}
     <div class="crm-wci-button-wrapper" id="crm_wid_{$wciform.widgetId}_button">
         <a href='{crmURL p="civicrm/contribute/transact" q="reset=1&id=$cpageId" h=0 a=1 fe=1}' class="crm-wci-button"><span class="crm-wci-button-inner" id="crm_wid_{$wciform.widgetId}_btn_txt">{$wciform.button_title}</span></a>
     </div>
+        {if $wciform.email_signup_group_id}
+        <hr>
+        {/if}
     {/if}
     {if $wciform.email_signup_group_id}
-      {if $embed eq 1 }
+      {if $preview eq 0 }
         <form action="{$wciform.emailSignupGroupFormURL}" method="post">
       {/if}
         <p id="newsletter_msg">
-          Get the monthly newsletter
+          {$wciform.newsletter_text}
         </p>
         <p id="newsletter_mail">
           <input id="frmEmail" type="text" name="email-Primary" size="18" maxlength="80" placeholder="email address">
         </p>
         <p id="newsletter_submit">
-          {if $embed eq 1 }
-            <input type="submit" name="_qf_Edit_next" value="Subscribe me">
+          {if $preview eq 0 }
+            <input class ="btnNL" type="submit" name="_qf_Edit_next" value="Subscribe me">
           {else}
-            <input type="button" name="_qf_Edit_next" value="Subscribe me">
+            <button class ="btnNL" type="button" name="_qf_Edit_next" value="Subscribe me">Subscribe me</button>
           {/if}
         </p>
         <div>
@@ -218,7 +236,7 @@
           <input type="hidden" name="group[{$wciform.email_signup_group_id}]" value="1">
           <input name="_qf_default" type="hidden" value="Edit:cancel">
         </div>
-      {if $embed eq 1 }
+      {if $preview eq 0 }
         </form>
       {/if}
     {/if}