Merge branch 'CRM-15202' of https://github.com/jmcclelland/civicrm-core into 4.7...

[civicrm-core.git] / ang / crmCxn / ManageCtrl.html

diff --git a/ang/crmCxn/ManageCtrl.html b/ang/crmCxn/ManageCtrl.html
index b60d68eef44e3732f530e272d86ed1350b86a1b8..03fb095064b6452497283b740adaf14fbb59ada6 100644 (file)
--- a/ang/crmCxn/ManageCtrl.html
+++ b/ang/crmCxn/ManageCtrl.html
@@ -9,6 +9,10 @@
  * Extant connections can be portrayed as enabled or disabled.
 -->
 
+<div class="help">
+  <p>{{ts('Connections provide a simplified way to link your CiviCRM installation to an external service.')}}</p>
+</div>
+
 <div ng-show="cxns.length > 0">
   <span crm-ui-order="{var: 'cxnOrder', defaults: ['-created_date']}"></span>
   <h3>{{ts('Existing Connections')}}</h3>
@@ -23,14 +27,15 @@
     </thead>
     <tbody>
     <tr ng-repeat="cxn in cxns  | orderBy:cxnOrder.get()" ng-class-even="'even-row even'" ng-class-odd="'odd-row odd'">
-      <td>{{cxn.app_meta.title}}</td>
+      <td>
+        <a class="action-item"
+           crm-confirm='{width: "65%", resizable: true, title:ts("%1: About", {1: cxn.app_meta.title}), templateUrl: "~/crmCxn/AboutCtrl.html", export: {appMeta: cxn.app_meta}}'
+            >{{cxn.app_meta.title}}</a>
+      </td>
       <td><div ng-bind-html="cxn.app_meta.desc"></div></td>
-      <td>{{cxn.is_active ? ts('Enabled') : ts('Disabled')}}</td>
+      <td>{{cxn.is_active=="1" ? ts('Enabled') : ts('Disabled')}}</td>
       <td>
         <span>
-            <!--
-            <a class="action-item crm-hover-button" ng-click="toggleCxn(cxn)">{{cxn.is_active ? ts('Disable') : ts('Enable') }}</a>
-            -->
             <a class="action-item crm-hover-button" ng-click="openLink(cxn.app_meta, 'settings', {title: ts('%1: Settings (External)', {1: cxn.app_meta.title})})" ng-show="cxn.app_meta.links.settings">{{ts('Settings')}}</a>
             <span class="btn-slide crm-hover-button">{{ts('more')}}
               <ul class="panel" style="display: none;">
@@ -49,9 +54,18 @@
                     {{ts('Support')}}
                   </a>
                 </li>
+                <li>
+                  <a class="action-item crm-hover-button" ng-click="toggleCxn(cxn)">{{ cxn.is_active=="1" ? ts('Disable') : ts('Enable')}}</a>
+                </li>
                 <li>
                   <a class="action-item crm-hover-button"
-                     crm-confirm='{width: "65%", resizable: true, title: ts("Disconnect"), message: ts("Are you sure you want to disconnect \"%1?\". Doing so may permanently destroy data linkage.", {1: cxn.app_meta.title})}'
+                     crm-confirm='{width: "65%", resizable: true, title:ts("%1: Reconnect", {1: cxn.app_meta.title}), templateUrl: "~/crmCxn/ConfirmReconnectCtrl.html", export: {cxn: cxn, appMeta: findAppByAppId(cxn.app_guid)}}'
+                     on-yes="reregister(cxn.app_meta)"
+                      >{{ts('Reconnect')}}</a>
+                </li>
+                <li>
+                  <a class="action-item crm-hover-button"
+                     crm-confirm='{width: "65%", resizable: true, title: ts("%1: Disconnect", {1: cxn.app_meta.title}), message: ts("Are you sure you want to disconnect \"%1?\". Doing so may permanently destroy data linkage.", {1: cxn.app_meta.title})}'
                      on-yes="unregister(cxn.app_meta)">
                     {{ts('Disconnect')}}
                   </a>
@@ -80,12 +94,15 @@
     </tr>
     </thead>
     <tbody>
-    <tr ng-repeat="appMeta in appMetas | orderBy:availOrder.get()" ng-show="!findCxnByAppId(appMeta.appId)">
-      <td>{{appMeta.title}}</td>
+    <tr ng-repeat="appMeta in appMetas | orderBy:availOrder.get()" ng-show="!findCxnByAppId(appMeta.appId)" ng-class-even="'even-row even'" ng-class-odd="'odd-row odd'">
+      <td>
+        <a crm-confirm='{width: "65%", resizable: true, title:ts("%1: About", {1: appMeta.title}), templateUrl: "~/crmCxn/AboutCtrl.html", export: {appMeta: appMeta}}'
+            >{{appMeta.title}}</a>
+      </td>
       <td><div ng-bind-html="appMeta.desc"></div></td>
       <td>
         <a class="action-item crm-hover-button"
-           crm-confirm='{width: "65%", resizable: true, title:ts("Connect"), templateUrl: "~/crmCxn/ConfirmConnectCtrl.html", export: {appMeta: appMeta}}'
+           crm-confirm='{width: "65%", resizable: true, title:ts("%1: Connect", {1: appMeta.title}), templateUrl: "~/crmCxn/ConfirmConnectCtrl.html", export: {appMeta: appMeta}}'
            on-yes="register(appMeta)"
           >{{ts('Connect')}}</a>
       </td>