X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=templates%2FCRM%2FUF%2FPage%2FField.tpl;h=95515046283bbb90529ea46d72a2b2d7d237cac7;hb=6f2311483b933b7547f5d24b2fdb2df1090b07a2;hp=a50a8b3662568cdc67a85228d35bfeef3b83127b;hpb=00ca8648aca9637f2678082ce09f98772533a8cc;p=civicrm-core.git

diff --git a/templates/CRM/UF/Page/Field.tpl b/templates/CRM/UF/Page/Field.tpl
index a50a8b3662..9551504628 100644
--- a/templates/CRM/UF/Page/Field.tpl
+++ b/templates/CRM/UF/Page/Field.tpl
@@ -23,7 +23,6 @@
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
 *}
-<script type="text/javascript" src="{$config->resourceBase}js/rest.js"></script>
 {if $showBestResult }
     <span class="font-red">{ts}For best results, the Country field should precede the State-Province field in your Profile form. You can use the up and down arrows on field listing page for this profile to change the order of these fields or manually edit weight for Country/State-Province Field.{/ts}</span>
 {/if}
@@ -46,8 +45,7 @@
         {* handle enable/disable actions*}
    {include file="CRM/common/enableDisableApi.tpl"}
    {include file="CRM/common/crmeditable.tpl"}
-   {include file="CRM/common/jsortable.tpl"}
-        <table id="options" class="display">
+        <table id="options" class="row-highlight">
             <thead>
             <tr>
                 <th>{ts}Field Name{/ts}</th>
@@ -56,12 +54,11 @@
                 <th>{ts}Searchable?{/ts}</th>
                 <th>{ts}In Selector?{/ts}</th>
                 {/if}
-                <th id="order" class="sortable">{ts}Order{/ts}</th>
+                <th>{ts}Order{/ts}</th>
                 <th>{ts}Required{/ts}</th>
                 <th>{ts}View Only{/ts}</th>
                 <th>{ts}Reserved{/ts}</th>
                 <th></th>
-                <th class="hiddenElement"></th>
             </tr>
             </thead>
             {foreach from=$ufField item=row}
@@ -72,12 +69,11 @@
                 <td class="crmf-is_searchable">{if $row.is_searchable   eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
                 <td class="crmf-in_selector">{if $row.in_selector     eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
                 {/if}
-                <td class="nowrap">{$row.order}</td>
+                <td class="nowrap">{$row.weight}</td>
                 <td class="crmf-is_required">{if $row.is_required     eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
                 <td>{if $row.is_view         eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
                 <td>{if $row.is_reserved     eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}</td>
                 <td>{$row.action|replace:'xx':$row.id}</td>
-                <td class="order hiddenElement">{$row.weight}</td>
             </tr>
             {/foreach}
         </table>
@@ -93,9 +89,12 @@
     {else}
         {if $action eq 16}
         {capture assign=crmURL}{crmURL p="civicrm/admin/uf/group/field/add" q="reset=1&action=add&gid=$gid"}{/capture}
-        <div class="messages status no-popup">
-        <div class="icon inform-icon"></div>
-       {ts 1=$groupTitle 2=$crmURL}There are no CiviCRM Profile Fields for '%1', you can <a href='%2'>add one now</a>.{/ts}
+        <div class="messages status no-popup crm-empty-table">
+          <div class="icon inform-icon"></div>
+          {ts}None found.{/ts}
+        </div>
+        <div class="action-link">
+          <a href="{crmURL p="civicrm/admin/uf/group/field/add" q="reset=1&action=add&gid=$gid"}" class="button"><span><div class="icon add-icon"></div>{ts}Add Field{/ts}</span></a>
         </div>
         {/if}
     {/if}