Skip to content

Commit

Permalink
Merge pull request #23 from andela/ft-team-access-awareness-#156577855
Browse files Browse the repository at this point in the history
Ft 156577855 team access awareness
  • Loading branch information
Bruce Elbert Bigirwenkya committed May 18, 2018
2 parents dc65048 + cb5eda2 commit 046ddf1
Show file tree
Hide file tree
Showing 11 changed files with 83 additions and 1 deletion.
7 changes: 7 additions & 0 deletions hc/front/tests/test_team_access_awareness.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
from hc.test import BaseTestCase

class WelcomePageTestCase(BaseTestCase):

def test_team_access_awareness(self):
r = self.client.get("/")
self.assertContains(r, "Create a team and manage checks as a team", status_code=200)
7 changes: 7 additions & 0 deletions static/css/welcome.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@
margin-bottom: 0;
}

.carousel-indicators .active {
background-color: #9c3f3f !important;
}
.carousel-indicators li {
border: 1px solid #9c3f3f !important;
}

.index-bleed {
background: #FFF;
padding-bottom: 2em;
Expand Down
Binary file added static/img/2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added static/img/account_settings.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added static/img/account_settings1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added static/img/invite_member.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added static/img/invite_member1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added static/img/tasks2x_.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added static/img/team_check.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added static/img/x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
70 changes: 69 additions & 1 deletion templates/front/welcome.html
Original file line number Diff line number Diff line change
Expand Up @@ -230,9 +230,11 @@ <h2 class="tour-title">A quick peek of what's inside:</h2>
</div>
</div>



<div class="row tour-section">
<div class="col-sm-8">
<img class="img-responsive" src="{% static 'img/tasks.png' %}" srcset="{% static 'img/tasks.png'%} 1x, {% static 'img/tasks@2x.png'%} 2x"
<img class="img-responsive" src="{% static 'img/tasks.png' %}" srcset="{% static 'img/tasks.png'%} 1x, {% static 'img/tasks2x_.png'%} 2x"
alt="GUI for creation of checks" />
</div>
<div class="col-sm-4">
Expand All @@ -247,6 +249,69 @@ <h2 class="tour-title">A quick peek of what's inside:</h2>
</div>
</div>


<div class="row tour-section">
<div class="col-sm-12">
<div id="myCarousel" class="carousel slide" data-ride="carousel">
<!-- Indicators -->
<ol class="carousel-indicators">
<li data-target="#myCarousel" data-slide-to="0" class="active"></li>
<li data-target="#myCarousel" data-slide-to="1"></li>
</ol>

<!-- Wrapper for slides -->
<div class="carousel-inner">
<div class="item active">
<img class="img-responsive col-sm-8" src="{% static 'img/account_settings1.png' %}" srcset="{% static 'img/account_settings1.png'%} 1x, {% static 'img/account_settings1.png'%} 2x"
alt="GUI for creation of checks" />
<div class="col-sm-4">
<strong>1: Create a team and manage checks as a team.</strong>
<p>Team access feature is not enabled by default. Upgrade to one of the paid plans to enable team access.</p>

<table class="table">
<tr>
<td>
Go to <small> <strong>account settings,

</strong> </small > click <small> <strong>paid plans</strong></small> and subscribe to enable team access.
</td>
</tr>
<tr>
<td>
Health checks by default creates for you a free account.
Upgrade to one of the two subcription accounts to gain team access and increase yur log entries per check
</td>
</tr>
</table>
</div>
</div>

<div class="item">
<img class="img-responsive col-sm-8" src="{% static 'img/invite_member1.png' %}" srcset="{% static 'img/invite_member1.png'%} 1x, {% static 'img/invite_member1.png'%} 2x"
alt="GUI for creation of checks" />
<div class="col-sm-4">
<strong>2: Create a team and manage checks as a team - ctd.</strong>
<p>Access the expanded dashboard on successful subscription. Add members email and assign them team checks if any before sending them and invite.</p>

<table class="table">
<tr>
<td>
Invites are sent via email.
</td>
</tr>
<tr>
<td>
Team members <strong>only</strong> access and manage team checks assigned to them including status notificatons.
</td>
</tr>
</table>
</div>
</div>
</div>
</div>
</div>
</div>

<div class="index-bleed">
<div class="container">

Expand Down Expand Up @@ -382,6 +447,9 @@ <h2 id="pitch-subtitle">Here's an unique ping address for you:</h2>
<script src="{% static 'js/collapse-native.js' %}"></script>
<script src="{% static 'js/tab-native.js' %}"></script>
<script src="{% static 'js/welcome.js' %}"></script>
<script src="https://code.jquery.com/jquery-2.2.4.min.js" integrity="sha256-BbhdlvQf/xTY9gja0Dq3HiwQF8LaCRTXxZKRutelT44="
crossorigin="anonymous"></script>
<script src="{% static 'js/bootstrap.min.js' %}"></script>
<script src="https://cdn.rawgit.com/mattboldt/typed.js/master/lib/typed.min.js"></script>

<script>
Expand Down

0 comments on commit 046ddf1

Please sign in to comment.