From cc72938814876bed8c66fa556efcb46e6d49271b Mon Sep 17 00:00:00 2001
From: Marcelo Schmidt <marcelo.schmidt@konecty.com>
Date: Tue, 18 Aug 2015 17:41:00 -0300
Subject: [PATCH] Replaced /settings for /admin
---
client/views/admin/admin.html | 154 ------------------
.../adminUserChannels.coffee} | 2 +-
.../adminUserChannels.html} | 2 +-
.../adminUserInfo.coffee} | 5 +-
.../adminUserInfo.html} | 2 +-
client/views/admin/adminUsers.html | 14 +-
6 files changed, 14 insertions(+), 165 deletions(-)
rename client/views/{settings/settingsUserChannels.coffee => admin/adminUserChannels.coffee} (68%)
rename client/views/{settings/settingsUserChannels.html => admin/adminUserChannels.html} (78%)
rename client/views/{settings/settingsUserInfo.coffee => admin/adminUserInfo.coffee} (95%)
rename client/views/{settings/settingsUserInfo.html => admin/adminUserInfo.html} (96%)
diff --git a/client/views/admin/admin.html b/client/views/admin/admin.html
index 9b03e037364..cab68bbb7ad 100644
--- a/client/views/admin/admin.html
+++ b/client/views/admin/admin.html
@@ -39,74 +39,6 @@
{{/if}}
{{/each}}
</fieldset>
- {{!-- <fieldset>
- <legend>
- <h3>This is another section</h3>
- <p>This is a configuration text. With configuration info</p>
- </legend>
- <div class="input-line double-col">
- <label>Input Field</label>
- <div>
- <input type="text" name="input-name" />
- </div>
- </div>
- <div class="input-line double-col">
- <label>Select Field</label>
- <div>
- <select name="select">
- <option value="1">Option A</option>
- <option value="1">Option B</option>
- <option value="1">Option C</option>
- <option value="1">Option D</option>
- <option value="1">Option E</option>
- </select>
- </div>
- </div>
- </fieldset>
- <fieldset>
- <legend>
- <h3>This is another section</h3>
- <p>This is a configuration text. With configuration info</p>
- </legend>
- <div class="input-line double-col">
- <label>Radio field</label>
- <div>
- <label><input type="radio" name="pandora" value="1" /> Calazar</label>
- <label><input type="radio" name="pandora" value="2" /> Genoveve</label>
- </div>
- </div>
- <div class="input-line double-col">
- <label>Checkbox field</label>
- <div>
- <label><input type="checkbox" name="pandora" value="1" /> Calazar</label>
- <label><input type="checkbox" name="pandora" value="2" /> Genoveve</label>
- </div>
- </div>
- </fieldset>
- <fieldset>
- <legend>
- <h3>This is another section</h3>
- <p>This is a configuration text. With configuration info</p>
- </legend>
- <div class="input-line double-col">
- <label>Input Field</label>
- <div>
- <input type="text" name="input-name" />
- </div>
- </div>
- <div class="input-line double-col">
- <label>Select Field</label>
- <div>
- <select name="select">
- <option value="1">Option A</option>
- <option value="1">Option B</option>
- <option value="1">Option C</option>
- <option value="1">Option D</option>
- <option value="1">Option E</option>
- </select>
- </div>
- </div>
- </fieldset> --}}
<div class="submit">
<button class="button"><i class="icon-send"></i><span>{{_ "Save_changes"}}</span></button>
</div>
@@ -114,90 +46,4 @@
{{/unless}}
</div>
</section>
- {{!-- <section class="page-container page-home page-static">
- <header class="fixed-title">
- {{> burger}}
- <h2>
- <span class="room-title">{{_ "App_Settings"}}</span>
- </h2>
- </header>
- <div class="content">
- <div class="info">
- <p>Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book.</p>
- </div>
- <div class="rocket-form">
- <fieldset>
- <legend>
- <h3>This is another section</h3>
- <p>This is a configuration text. With configuration info</p>
- </legend>
- <div class="input-line double-col">
- <label>Input Field</label>
- <div>
- <input type="text" name="input-name" />
- </div>
- </div>
- <div class="input-line double-col">
- <label>Select Field</label>
- <div>
- <select name="select">
- <option value="1">Option A</option>
- <option value="1">Option B</option>
- <option value="1">Option C</option>
- <option value="1">Option D</option>
- <option value="1">Option E</option>
- </select>
- </div>
- </div>
- </fieldset>
- <fieldset>
- <legend>
- <h3>This is another section</h3>
- <p>This is a configuration text. With configuration info</p>
- </legend>
- <div class="input-line double-col">
- <label>Radio field</label>
- <div>
- <label><input type="radio" name="pandora" value="1" /> Calazar</label>
- <label><input type="radio" name="pandora" value="2" /> Genoveve</label>
- </div>
- </div>
- <div class="input-line double-col">
- <label>Checkbox field</label>
- <div>
- <label><input type="checkbox" name="pandora" value="1" /> Calazar</label>
- <label><input type="checkbox" name="pandora" value="2" /> Genoveve</label>
- </div>
- </div>
- </fieldset>
- <fieldset>
- <legend>
- <h3>This is another section</h3>
- <p>This is a configuration text. With configuration info</p>
- </legend>
- <div class="input-line double-col">
- <label>Input Field</label>
- <div>
- <input type="text" name="input-name" />
- </div>
- </div>
- <div class="input-line double-col">
- <label>Select Field</label>
- <div>
- <select name="select">
- <option value="1">Option A</option>
- <option value="1">Option B</option>
- <option value="1">Option C</option>
- <option value="1">Option D</option>
- <option value="1">Option E</option>
- </select>
- </div>
- </div>
- </fieldset>
- <div class="submit">
- <button class="button"><i class="icon-send"></i><span>Save changes</span></button>
- </div>
- </div>
- </div>
- </section> --}}
</template>
\ No newline at end of file
diff --git a/client/views/settings/settingsUserChannels.coffee b/client/views/admin/adminUserChannels.coffee
similarity index 68%
rename from client/views/settings/settingsUserChannels.coffee
rename to client/views/admin/adminUserChannels.coffee
index 691801450c6..55c4b5d448c 100644
--- a/client/views/settings/settingsUserChannels.coffee
+++ b/client/views/admin/adminUserChannels.coffee
@@ -1,3 +1,3 @@
-Template.settingsUserChannels.helpers
+Template.adminUserChannels.helpers
type: ->
return if @t is 'd' then 'at' else if @t is 'p' then 'lock' else 'hash'
\ No newline at end of file
diff --git a/client/views/settings/settingsUserChannels.html b/client/views/admin/adminUserChannels.html
similarity index 78%
rename from client/views/settings/settingsUserChannels.html
rename to client/views/admin/adminUserChannels.html
index 466881c2377..468a4951e92 100644
--- a/client/views/settings/settingsUserChannels.html
+++ b/client/views/admin/adminUserChannels.html
@@ -1,4 +1,4 @@
-<template name="settingsUserChannels">
+<template name="adminUserChannels">
<div class="user-info-channel">
<h3><a href="{{pathFor 'room' _id=rid}}"><i class="icon-{{type}}"></i> {{name}}</a></h3>
</div>
diff --git a/client/views/settings/settingsUserInfo.coffee b/client/views/admin/adminUserInfo.coffee
similarity index 95%
rename from client/views/settings/settingsUserInfo.coffee
rename to client/views/admin/adminUserInfo.coffee
index 2bffbbf27f5..75caa12027e 100644
--- a/client/views/settings/settingsUserInfo.coffee
+++ b/client/views/admin/adminUserInfo.coffee
@@ -1,4 +1,4 @@
-Template.settingsUserInfo.helpers
+Template.adminUserInfo.helpers
name: ->
return if @name then @name else TAPi18next.t 'project:Unnamed'
email: ->
@@ -19,7 +19,7 @@ Template.settingsUserInfo.helpers
return "UTC #{@utcOffset}"
-Template.settingsUserInfo.events
+Template.adminUserInfo.events
'click .deactivate': ->
Meteor.call 'setUserActiveStatus', Template.currentData()._id, false, (error, result) ->
if result
@@ -57,3 +57,4 @@ Template.settingsUserInfo.events
Meteor.call 'deleteUser', _id, (error, result) ->
if error
toastr.error error.reason
+
diff --git a/client/views/settings/settingsUserInfo.html b/client/views/admin/adminUserInfo.html
similarity index 96%
rename from client/views/settings/settingsUserInfo.html
rename to client/views/admin/adminUserInfo.html
index 188bcf921f1..693a24683eb 100644
--- a/client/views/settings/settingsUserInfo.html
+++ b/client/views/admin/adminUserInfo.html
@@ -1,4 +1,4 @@
-<template name="settingsUserInfo">
+<template name="adminUserInfo">
<div class="about clearfix">
<div class="thumb">
{{> avatar username=username}}
diff --git a/client/views/admin/adminUsers.html b/client/views/admin/adminUsers.html
index 3477fcf6e97..a9207ff8c2e 100644
--- a/client/views/admin/adminUsers.html
+++ b/client/views/admin/adminUsers.html
@@ -46,19 +46,21 @@
<div class="control">
<button class="more"><span class="arrow {{arrowPosition}}"></span></button>
<div class="user-info-tabs">
- <a href="#settingsUserInfo" class="active"><i class="icon-at"></i></a>
- <a href="#settingsUserChannels"><i class="icon-hash"></i></a>
+ <a href="#adminUserInfo" class="active"><i class="icon-at"></i></a>
+ <a href="#adminUserChannels"><i class="icon-hash"></i></a>
</div>
</div>
{{#if flexOpened}}
<div class="content">
<div class="user-view">
- <div id="settingsUserInfo" class="user-info-content">
- {{> settingsUserInfo userData}}
+ <div id="adminUserInfo" class="user-info-content">
+ {{#if userData}}
+ {{> adminUserInfo userData}}
+ {{/if}}
</div>
- <div id="settingsUserChannels" class="user-info-content channels" style="display: none">
+ <div id="adminUserChannels" class="user-info-content channels" style="display: none">
{{#each userChannels}}
- {{> settingsUserChannels}}
+ {{> adminUserChannels}}
{{/each}}
</div>
</div>
--
GitLab