spawntree
/
probuddy-master
2
0
Derivar 0
Código Questões 0 Pedidos de integração 0 Lançamentos 0 Wiki Trabalho
Ver a proveniência

css fixes

master
Daniel há 2 anos
ascendente
0dbe05edb5
cometimento
7948b2cc74
6 ficheiros alterados com 20 adições e 336 eliminações
Visualização em 2 colunas
Opções das diferenças
Mostrar estatísticas Descarregar ficheiro patch Descarregar ficheiro diff
  1. +2
    -2
      src/client/app/css/app.css
  2. +15
    -15
      src/client/app/tmpl/group-detail.html
  3. +0
    -3
      src/client/app/tmpl/group-member-management-body-adminnote.html
  4. +0
    -62
      src/client/app/tmpl/group-member-management-body-appointment-log.html
  5. +0
    -251
      src/client/app/tmpl/group-member-management-body.html
  6. +3
    -3
      src/client/app/tmpl/group-member-management.html

+ 2
- 2
src/client/app/css/app.css Ver ficheiro

@@ -535,10 +535,10 @@ body.body-auth .action-button {
[data-id="member-header"] .nav-tabs .nav-link {
cursor: pointer;
}
.group-members-content {
.group-members-tab-content {
display: none;
}
.group-members-content.active {
.group-members-tab-content.active {
display: block;
}


+ 15
- 15
src/client/app/tmpl/group-detail.html Ver ficheiro

@@ -48,6 +48,21 @@
<div class="card-footer">
<div class="row">
<div class="col">
<p>
<% var status = currentProfile.getGroupData( group.getId() ).status %>
<%= _lc( 'GROUP_DETAIL_STATUS' ) %>:
<% if ( status === 'active' ) { %>
<%= _lc( 'GROUP_MANAGEMENT_MEMBERS_ACTIVE' ) %>
<% } else if ( status === 'inactive' ) { %>
<%= _lc( 'GROUP_MANAGEMENT_MEMBERS_INACTIVE' ) %>
<% } else if ( status === 'not_approved' ) { %>
<%= _lc( 'GROUP_MANAGEMENT_MEMBERS_NOT_APPROVED' ) %>
<% } %>
<br>
<% if ( status === 'inactive' || status === 'not_approved' ) { %>
<%= _lc( 'GROUP_DETAIL_NOTE_INACTIVE_OR_NOT_APPROVED' ) %>
<% } %>
</p>
<% if ( null !== currentProfile && currentProfile.isAdminOfGroup( group.getId() ) ) { %>
<button type="button"
data-id="btn-edit-group"
@@ -77,21 +92,6 @@
<% } %>
</div>
</div>
<div class="row">
<% var status = currentProfile.getGroupData( group.getId() ).status %>
<%= _lc( 'GROUP_DETAIL_STATUS' ) %>:
<% if ( status === 'active' ) { %>
<%= _lc( 'GROUP_MANAGEMENT_MEMBERS_ACTIVE' ) %>
<% } else if ( status === 'inactive' ) { %>
<%= _lc( 'GROUP_MANAGEMENT_MEMBERS_INACTIVE' ) %>
<% } else if ( status === 'not_approved' ) { %>
<%= _lc( 'GROUP_MANAGEMENT_MEMBERS_NOT_APPROVED' ) %>
<% } %>
<br>
<% if ( status === 'inactive' || status === 'not_approved' ) { %>
<%= _lc( 'GROUP_DETAIL_NOTE_INACTIVE_OR_NOT_APPROVED' ) %>
<% } %>
</div>
</div>
</div>
</div>

+ 0
- 3
src/client/app/tmpl/group-member-management-body-adminnote.html Ver ficheiro

@@ -1,3 +0,0 @@
<textarea class="form-control"
style="height: 120px"
data-id="textarea-admin-note"><%= adminNote %></textarea>

+ 0
- 62
src/client/app/tmpl/group-member-management-body-appointment-log.html Ver ficheiro

@@ -1,62 +0,0 @@
<div class="table-responsive">
<table class="table">
<thead>
<tr>
<th style="border-top: none">
<%= _lc( 'COURSE' ) %>
</th>
<th style="border-top: none">
<%= _lc( 'STARTTIME' ) %>
</th>
<th style="border-top: none">
<%= _lc( 'ENDTIME' ) %>
</th>
<th style="border-top: none">
&nbsp;
</th>
</tr>
</thead>
<tbody>
<% if ( logs && logs.length > 0 ) { %>
<% for ( var li = 0; li < logs.length; li++ ) { %>
<tr data-appointment-id="<%= logs[ li ].appointment_id %>"
data-type="appointment-log-item"
class="clickable">
<td>
<%= logs[ li ].subject %><br />
<small>
<%= _lc( 'ATTENDANCE' ) %>
<% if ( 'accepted' === logs[ li ].status ) { %>
(<%= _lc( 'WITH_ACCEPTED_FEEDBACK' ) %>)
<% } else { %>
(<%= _lc( 'WITHOUT_ACCEPTED_FEEDBACK' ) %>)
<% } %>
</small>
</td>
<td>
<%= app.util.Helper.getMomentFromUTCTime( logs[ li ].start_dt ).format( 'DD.MM.YYYY [-] HH:mm' ) %>
</td>
<td>
<%= app.util.Helper.getMomentFromUTCTime( logs[ li ].end_dt ).format( 'DD.MM.YYYY [-] HH:mm' ) %>
</td>
<td>
<i class="fas fa-chevron-right"></i>
</td>
</tr>
<% } %>
<% } else { %>
<tr>
<td colspan="4">
<%= _lc( 'NO_LOG_ENTRIES_FOUND' ) %>
</td>
</tr>
<% } %>
</tbody>
</table>
</div>

+ 0
- 251
src/client/app/tmpl/group-member-management-body.html Ver ficheiro

@@ -1,251 +0,0 @@
<% if ( p ) { %>
<div class="row">
<div class="col text-center">
<img class="img-fluid rounded-circle profile-image-big img-thumbnail"
style="margin-bottom: 12px; padding: 6px"
src="<%= p.getProfileImg() %>" />
</div>
</div>
<div class="row">
<div class="col text-center">
<div style="font-size: 1.4rem">
<%=raw p.getName() %>
</div>
<% if ( p.isInGroupCategory( 'DOGSCHOOL' ) ) { %>
<div class="profile-header">
<%= _lc( 'PROFILE_DOGNAME' ) %>
</div>
<div class="profile-content">
<%= p.getCustomGroupProperty( 'DOGSCHOOL', 'dogname' ) ? p.getCustomGroupProperty( 'DOGSCHOOL', 'dogname' ) : '---' %>
</div>
<% } %>
<div class="profile-header">
<%= _lc( 'PROFILE_STATUS' ) %>
</div>
<div class="profile-content">
<%= p.getStatus() %>
</div>
<div class="profile-header">
<%= _lc( 'ADDRESS' ) %>
</div>
<div class="profile-content">
<%= p.getStreet() ? p.getStreet() : '---' %><br />
<%= p.getZipCode() ? p.getZipCode() : '' %>&nbsp;<%= p.getCity() ? p.getCity() : '' %>
</div>
<div class="profile-header">
<%= _lc( 'PHONE' ) %>
</div>
<div class="profile-content">
<% if ( p.getMobile() ) { %>
<a href="tel:<%= p.getMobile() %>"><%= p.getMobile() %></a>
<% } else { %>
---
<% } %>
<br />
<% if ( p.getPhone() ) { %>
<a href="tel:<%= p.getPhone() %>"><%= p.getPhone() %></a>
<% } else { %>
---
<% } %>
</div>
<div class="profile-header">
<%= _lc( 'EMAIL' ) %>
</div>
<div class="profile-content">
<% if ( p.getEmail() ) { %>
<a href="mailto:<%= p.getEmail() %>"><%= p.getEmail() %></a>
<% } else { %>
---
<% } %>
</div>
<div class="profile-header">
<%= _lc( 'BIRTHDAY' ) %>
</div>
<div class="profile-content">
<%= ( null != p.getMomentBirthday() ) ? p.getMomentBirthday().format( 'DD.MM.YYYY' ) : '---' %>
</div>
<div class="profile-header">
<%= _lc( 'JOIN_DT' ) %>
</div>
<div class="profile-content">
<% var momentJoin = p.getMomentJoinInGroup( g.getId() ); %>
<%= ( null != momentJoin ) ? momentJoin.format( 'DD.MM.YYYY' ) : '---' %>
</div>
</div>
</div>
<hr />
<div class="row">
<div class="col">
<strong><%= _lc( 'CHANGE_ROLE' ) %></strong>
</div>
</div>
<div class="row">
<div class="col-6">
<select class="form-control form-control-sm"
<%= ( 'trainer' === p.getRoleInGroup( g.getId() ) ) ? 'disabled="disabled"' : '' %>
data-id="select-member-role">
<option value="player" <%= ( 'player' === p.getRoleInGroup( g.getId() ) ) ? 'selected="selected"' : '' %> >
<%= _lc( 'GROUP_MEMBER' ) %>
</option>
<option value="cotrainer" <%= ( 'cotrainer' === p.getRoleInGroup( g.getId() ) ) ? 'selected="selected"' : '' %> >
<%= _lc( 'GROUP_ADMIN' ) %>
</option>
<% if ( 'trainer' === p.getRoleInGroup( g.getId() ) ) { %>
<option value="trainer" <%= ( 'trainer' === p.getRoleInGroup( g.getId() ) ) ? 'selected="selected"' : '' %> >
<%= _lc( 'GROUP_OWNER' ) %>
</option>
<% } %>
</select>
</div>
<div class="col">
<button class="btn btn-primary btn-sm"
data-id="btn-update-role">
<%= _lc( 'BTN_SAVE_NEW_ROLE' ) %>
</button>
</div>
<% if ( 'trainer' === p.getRoleInGroup( g.getId() ) ) { %>
<div class="col-sm-12">
<small><i><%= _lc( 'CANNOT_CHANGE_GROUP_OWNER_ROLE_INFO' ) %></i></small>
</div>
<% } %>
</div>
<hr />
<div class="row">
<div class="col">
<strong><%= _lc( 'ASSIGNED_MEMBER_GROUP_CATEGORIES' ) %></strong>
</div>
</div>
<div class="row">
<div class="col">
<% var cgs = g.getCourseCategoriesForProfile( p ); %>
<% for ( var cgsi = 0; cgsi < cgs.length; cgsi++ ) { %>
<% if ( cgsi > 0 ) { %>
<%= ' ' %>
<% } %>
<span class="badge badge-pill badge-primary"><%= cgs[ cgsi ].name %></span>
<% } %>
</div>
<div class="col-sm-12">
<small><i><%= _lc( 'ASSIGNED_MEMBER_CATEOGORY_INFO' ) %></i></small>
</div>
<div class="col">
<a href="#/course/categories/<%= g.getId() %>"
class="btn btn-primary btn-sm">
<%= _lc( 'BTN_NAVIGATE_TO_CATEGORY_MANAGEMENT' ) %>
</a>
</div>
</div>
<hr />
<div class="row">
<div class="col">
<strong><%= _lc( 'MEMBER_CONTRACT' ) %></strong>
</div>
</div>
<div class="row">
<div class="col-6">
<div class="form-group" style="margin-bottom:0;">
<label for="appointment-log-until">
<%= _lc( 'CONTRACT_NAME' ) %>
</label>
<input type="text"
class="form-control"
maxlength="128"
value="<%= p.getContractInGroup( g.getId() ) ? p.getContractInGroup( g.getId() ) : '' %>"
data-id="input-contract" />
</div>
</div>
<div class="col-6">
<div class="form-group" style="margin-bottom:0;">
<label for="contract-date">
<%= _lc( 'CONTRACT_DATE' ) %>
</label>
<input type="date"
id="contract-date"
value="<%= p.getContractMomentInGroup( g.getId() ) ? p.getContractMomentInGroup( g.getId() ).format( 'YYYY-MM-DD' ) : '' %>"
data-id="input-contract-moment"
class="form-control" />
</div>
</div>
<div class="col">
<button class="btn btn-primary btn-sm"
data-id="btn-update-contract">
<%= _lc( 'BTN_SAVE_MEMBER_CONTRACT' ) %>
</button>
</div>
</div>
<hr />
<div class="row">
<div class="col">
<strong><%= _lc( 'APPOINTMENT_LOG' ) %></strong>
</div>
</div>
<div class="row">
<div class="col-lg-6 col-md-12">
<div class="form-group" style="margin-bottom:0;">
<label for="appointment-log-from">
<%= _lc( 'FROM' ) %>
</label>
<input type="date"
id="appointment-log-from"
value="<%= p.getContractMomentInGroup( g.getId() ) ? p.getContractMomentInGroup( g.getId() ).format( 'YYYY-MM-DD' ) : moment().subtract( 30, 'days' ).format( 'YYYY-MM-DD' ) %>"
data-id="input-appointment-log-from"
class="form-control" />
</div>
</div>
<div class="col-lg-6 col-md-12">
<div class="form-group" style="margin-bottom:0;">
<label for="appointment-log-until">
<%= _lc( 'UNTIL' ) %>
</label>
<input type="date"
id="appointment-log-until"
value="<%= moment().format( 'YYYY-MM-DD' ) %>"
data-id="input-appointment-log-until"
class="form-control" />
</div>
</div>
<div class="col">
<button class="btn btn-primary btn-sm"
data-id="btn-update-appointment-log">
<%= _lc( 'BTN_UPDATE_APPOINTMENT_LOG' ) %>
</button>
</div>
</div>
<div class="row">
<div class="col"
data-id="container-appointment-log">
<i class="fas fa-spinner fa-spin"></i>
</div>
</div>
<hr />
<div class="row">
<div class="col">
<strong><%= _lc( 'ADMIN_NOTES' ) %></strong><small> - <%= _lc( 'ADMIN_NOTES_INFO' ) %></small>
</div>
</div>
<div class="row">
<div class="col"
data-id="admin-note">
<i class="fas fa-spinner fa-spin"></i>
</div>
</div>
<div class="row">
<div class="col">
<button class="btn btn-primary btn-sm"
data-id="btn-save-admin-note">
<%= _lc( 'BTN_SAVE_ADMIN_NOTE' ) %>
</button>
</div>
</div>
<% } else { %>
<div class="row">
<div class="col">
<%= _lc( 'SELECT_MEMBER_TO_EDIT' ) %>
</div>
</div>
<% } %>

+ 3
- 3
src/client/app/tmpl/group-member-management.html Ver ficheiro

@@ -44,7 +44,7 @@
</div>
<div class="card-body" data-id="member-container">
<!-- active members -->
<div id="group-members-active-content" class="group-members-content <%= ( activeTab == 'active' ) ? 'active' : '' %>">
<div id="group-members-active-content" class="group-members-content group-members-tab-content <%= ( activeTab == 'active' ) ? 'active' : '' %>">
<div class="table-responsive">
<table class="table table-profiles">
<tbody>
@@ -56,7 +56,7 @@
</div>
</div>
<!-- inactive members -->
<div id="group-members-inactive-content" class="group-members-content <%= ( activeTab == 'inactive' ) ? 'active' : '' %>">
<div id="group-members-inactive-content" class="group-members-content group-members-tab-content <%= ( activeTab == 'inactive' ) ? 'active' : '' %>">
<div class="table-responsive">
<table class="table table-profiles">
<tbody>
@@ -68,7 +68,7 @@
</div>
</div>
<div id="group-members-not-approved-content" class="group-members-content <%= ( activeTab == 'not_approved' ) ? 'active' : '' %>">
<div id="group-members-not-approved-content" class="group-members-content group-members-tab-content <%= ( activeTab == 'not_approved' ) ? 'active' : '' %>">
<div class="table-responsive">
<table class="table table-profiles">
<tbody>


Escrever Pré-visualizar
Carregando…
Cancelar
Guardar