From c42b3ca65723bff4348a0b55e704f256b2f6d3fe Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Tue, 30 Sep 2014 13:22:45 +1000
Subject: [PATCH] fix messy merge

---
 ...irements.hbs => user_tl3_requirements.hbs} | 26 +++++++++----------
 1 file changed, 12 insertions(+), 14 deletions(-)
 rename app/assets/javascripts/admin/templates/{user_leader_requirements.hbs => user_tl3_requirements.hbs} (89%)

diff --git a/app/assets/javascripts/admin/templates/user_leader_requirements.hbs b/app/assets/javascripts/admin/templates/user_tl3_requirements.hbs
similarity index 89%
rename from app/assets/javascripts/admin/templates/user_leader_requirements.hbs
rename to app/assets/javascripts/admin/templates/user_tl3_requirements.hbs
index 50c27bc4f53..7aa08160183 100644
--- a/app/assets/javascripts/admin/templates/user_leader_requirements.hbs
+++ b/app/assets/javascripts/admin/templates/user_tl3_requirements.hbs
@@ -7,12 +7,12 @@
   </div>
 </div>
 
-<div class="admin-container leader-requirements">
+<div class="admin-container tl3-requirements">
   <h2>{{username}} - {{i18n admin.user.tl3_requirements.title}}</h2>
   <br/>
   <p>{{i18n admin.user.tl3_requirements.table_title}}</p>
 
-  {{#with leaderRequirements}}
+  {{#with tl3Requirements}}
     <table class="table" style="width: 50%;">
       <thead>
         <tr>
@@ -91,32 +91,32 @@
 
   <br/>
   <p>
-    {{#if isLeader}}
-      {{#if leaderRequirements.requirements_lost}}
+    {{#if istl3}}
+      {{#if tl3Requirements.requirements_lost}}
         {{! tl implicitly not locked }}
-        {{#if leaderRequirements.on_grace_period}}
+        {{#if tl3Requirements.on_grace_period}}
           <i class="fa fa-times"></i> {{i18n admin.user.tl3_requirements.on_grace_period}}
         {{else}} {{! not on grace period }}
           <i class="fa fa-times"></i> {{i18n admin.user.tl3_requirements.does_not_qualify}}
                                       {{i18n admin.user.tl3_requirements.will_be_demoted}}
         {{/if}}
-      {{else}} {{! requirements not lost - remains leader }}
-        {{#if leaderRequirements.trust_level_locked}}
+      {{else}} {{! requirements not lost - remains tl3 }}
+        {{#if tl3Requirements.trust_level_locked}}
           <i class="fa fa-lock"></i> {{i18n admin.user.tl3_requirements.locked_will_not_be_demoted}}
         {{else}} {{! tl not locked }}
           <i class="fa fa-check"></i> {{i18n admin.user.tl3_requirements.qualifies}}
-          {{#if leaderRequirements.on_grace_period}}
+          {{#if tl3Requirements.on_grace_period}}
             {{i18n admin.user.tl3_requirements.on_grace_period}}
           {{/if}}
         {{/if}}
       {{/if}}
-    {{else}} {{! is not leader }}
-      {{#if leaderRequirements.requirements_met}}
-        {{! met & not leader - will be promoted}}
+    {{else}} {{! is not tl3 }}
+      {{#if tl3Requirements.requirements_met}}
+        {{! met & not tl3 - will be promoted}}
         <i class="fa fa-check"></i> {{i18n admin.user.tl3_requirements.qualifies}}
                                     {{i18n admin.user.tl3_requirements.will_be_promoted}}
       {{else}} {{! requirements not met - remains regular }}
-        {{#if leaderRequirements.trust_level_locked}}
+        {{#if tl3Requirements.trust_level_locked}}
           <i class="fa fa-lock"></i> {{i18n admin.user.tl3_requirements.locked_will_not_be_promoted}}
         {{else}}
           <i class="fa fa-times"></i> {{i18n admin.user.tl3_requirements.does_not_qualify}}
@@ -125,5 +125,3 @@
     {{/if}}
   </p>
 </div>
-
-