Skip to content

Commit

Permalink
Onboarding CSS Fixed + Slack Page Fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
DEKHTIARJonathan committed Aug 14, 2017
1 parent cf962f9 commit 6d8b109
Show file tree
Hide file tree
Showing 6 changed files with 62 additions and 33 deletions.
29 changes: 29 additions & 0 deletions feedcrunch_rssadmin/static/css/custom-admin.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ input.valid{
}

.socialconnect-btn{
font-size: 12px;
width: 290px;
}

Expand Down Expand Up @@ -186,3 +187,31 @@ table.dataTable thead .sorting_desc {
.tabs .tab a:hover, .tabs .tab a.active {
color: inherit;
}

.slackBotHead{
max-height:120px;
}

.add_slackteam_btn{
border-radius: 7px;
border-width: 1px;
border-style: solid;
border-color: #a3a3a3;
width:100%
}

.add_slackteam_btn_img{
max-height: 80%;
top: 5px;
}

.add_slackteam_btn_label{
top: -14%;
position: relative;
}

.slack-team-div{
font-size: 1.1em;
min-height: 4rem;
line-height: 4rem;
}
12 changes: 0 additions & 12 deletions feedcrunch_rssadmin/static/js/admin-social-linking.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,12 +110,6 @@ $(document).ready(function() {
}, 1500);
});

$("#slack-btn-link").unbind("click");
$("#slack-btn-link").click(function() {
interval = setTimeout(function() {
checkSocialNetworkStatus("slack");
}, 1500);
});
}

function setUnlinkClickEvent() {
Expand All @@ -140,12 +134,6 @@ $(document).ready(function() {
return false;
});

$("#slack-btn-unlink").unbind("click");
$("#slack-btn-unlink").click(function(event) {
UnLinkSocialNetwork("slack");
event.preventDefault();
return false;
});
}

setLinkClickEvent();
Expand Down
2 changes: 1 addition & 1 deletion feedcrunch_rssadmin/static/onboarding/css/onboarding.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,7 @@ a:focus, a:hover {
box-shadow: 0 0 0 0;
}

.twitter-btn{
.socialconnect-btn{
font-size: 12px;
}

Expand Down
17 changes: 10 additions & 7 deletions feedcrunch_rssadmin/templates/admin/admin_slack_management.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,27 @@
<div class="card-content">
<div>
<div class="valign-wrapper">
<img src="{% static "images/services/SlackBotHead.png" %}" style="max-height:120px">
<img src="{% static "images/services/SlackBotHead.png" %}" class="slackBotHead">
<h4>Manage your Publication Settings for Slack</h4>
</div>

<div class="row" style="margin: 80px 0;">
<div class="col s12 m7 offset-m5 l5 offset-l7 xl4 offset-xl6">
<a class="waves-effect waves-light btn white valign-wrapper" style="border-radius: 7px;border-width: 1px; border-style: solid;border-color: #a3a3a3; width:100%" href="{{ slack_auth_url }}">
<img src="https://upload.wikimedia.org/wikipedia/commons/7/76/Slack_Icon.png" style="max-height: 80%;top: 5px;">
<span>Add a Slack Team</span>
<a class="waves-effect waves-light btn white valign-wrapper add_slackteam_btn" href="{{ slack_auth_url }}" target="_blank">
<img src="{% static "images/services/slack-btn-icon.png" %}" class="add_slackteam_btn_img">
<span class="add_slackteam_btn_label">Add a Slack Team</span>
</a>
</div>
</div>

<div class="row">

<div class="col m12 xl8 offset-xl2">

<i style="margin-bottom: 20px; display: block;">Click on any team to expand and manage publications per channel.</i>
<ul class="collapsible" data-collapsible="accordion">
{% for team, channels in teams.items %}
<li class="slack-team">
<div class="collapsible-header" style="font-size: 1.1em; min-height: 4rem; line-height: 4rem;">
<div class="collapsible-header" class="slack-team-div">
<i class="material-icons">group</i>
Team Slack:
<span style="font-weight: bold;" class="slack-team-name">{{ team }}</span>
Expand All @@ -50,7 +50,10 @@ <h4>Manage your Publication Settings for Slack</h4>
{% endif %}
<span class="slack-channel-name">{{ channel.name }}</span>
<div class="switch secondary-content">
<label><input type="checkbox" data-init="{{ channel.active|yesno:"true,false" }}" class="slack-team-switch"><span class="lever"></span></label>
<label>
<input type="checkbox" data-init="{{ channel.active|yesno:"true,false" }}" class="slack-team-switch">
<span class="lever"></span>
</label>
</div>
</div>
</li>
Expand Down
6 changes: 3 additions & 3 deletions feedcrunch_rssadmin/templates/admin/admin_social_sharing.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
Link My Twitter Account
</a>
{% else %}
<button class="waves-effect waves-light btn red twitter-btn socialconnect-btn" id="twitter-btn-unlink">
<button class="waves-effect waves-light btn red socialconnect-btn" id="twitter-btn-unlink">
Unlink My Twitter Account
</button>
{% endif %}
Expand Down Expand Up @@ -84,8 +84,8 @@
<p>Link your Feedcrunch Account to Slack Teams and automate your posting workflows.</p>
</div>
<div class="card-action" style="text-align: center;" id="slack-btn-div">
<a href="{{ slack_auth_url }}" target="_target" class="waves-effect waves-light btn blue socialconnect-btn" id="slack-btn-link">
Link to a Slack Team
<a href="slack/" class="waves-effect waves-light btn blue socialconnect-btn">
Link to a Slack Team
</a>
</div>
</div>
Expand Down
29 changes: 19 additions & 10 deletions feedcrunch_rssadmin/templates/admin/onboarding.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
<link type="text/css" rel="stylesheet" href="{% static "onboarding/css/onboarding.css" %}">

<!--[if lt IE 9]>
<script src="http://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="http://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]-->
</head>
<body>
Expand Down Expand Up @@ -192,7 +192,7 @@ <h2 class="hide_laptop">Create Opportunities</h2>
Link My Twitter Account
</a>
{% else %}
<button class="waves-effect waves-light btn red twitter-btn socialconnect-btn" id="twitter-btn-unlink">
<button class="waves-effect waves-light btn red socialconnect-btn" id="twitter-btn-unlink">
Unlink My Twitter Account
</button>
{% endif %}
Expand All @@ -208,7 +208,7 @@ <h2 class="hide_laptop">Create Opportunities</h2>
<div class="white height100">
<div class="card" id="profile-page-header">
<div class="card-image header-img">
<img alt="user background" class="activator" src="{% static "images/social-logos/bg-fb.png" %}">
<img alt="user background" class="activator" src="{% static "images/social-logos/bg-fb.jpg" %}">
</div>
<figure class="card-profile-image">
<img alt="profile image" class="circle z-depth-2 responsive-imgMod activator" src="{% static "images/social-logos/facebook.png" %}">
Expand Down Expand Up @@ -266,15 +266,17 @@ <h2 class="hide_laptop">Create Opportunities</h2>
<div class="white height100">
<div class="card" id="profile-page-header">
<div class="card-image header-img">
<img alt="user background" class="activator" src="{% static "images/social-logos/bg-gp.jpg" %}">
<img alt="user background" class="activator" src="{% static "images/social-logos/bg-sk.jpg" %}">
</div>
<figure class="card-profile-image">
<img alt="profile image" class="circle z-depth-2 responsive-imgMod activator" src="{% static "images/social-logos/slack.png" %}">
</figure>
<div class="card-content">
<div class="row social-btn-row">
<div class="col s12" style="text-align: center;">
<button class="btn waves-effect waves-light red" type="submit" name="action" style="font-size: 12px;" disabled="">Coming Soon</button>
<div class="col s12" id="slack-btn-div">
<button class="waves-effect waves-light btn red socialconnect-btn" id="slack-btn-unlink" disabled="">
Coming Soon
</button>
</div>
</div>
</div>
Expand Down Expand Up @@ -379,7 +381,7 @@ <h2 class="hide_laptop">Create Opportunities</h2>
<textarea id="description" name="description" class="validate materialize-textarea description-textarea" data-init="{{ user.description }}">{{ user.description }}</textarea>
<label for="description">Description</label>
</div>
<div class="col s12" style="text-align:right;">
<div class="col s12" style="position: absolute; text-align:right; bottom: 5px; width: calc(50% - 15px);">
{% csrf_token %}
{% if next %}
<input type="hidden" name="next" value="{{ next }}" />
Expand All @@ -404,13 +406,20 @@ <h2 class="hide_laptop">Create Opportunities</h2>
</div>

<!-- Javascripts -->

<!-- JQUERY -->
<script type="text/javascript" src="{% static "plugins/jquery/jquery-2.2.0.min.js" %}"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.16.0/jquery.validate.min.js" integrity="sha256-UOSXsAgYN43P/oVrmU+JlHtiDGYWN2iHnJuKY9WD+Jg=" crossorigin="anonymous"></script>

<!-- Materialize -->
<script type="text/javascript" src="{% static "plugins/materialize/js/materialize.min.js" %}"></script>
<!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.1/js/materialize.min.js" integrity="sha256-3mqgTUhHNgfXgjrzjPOaW03DdQ9hgW92BApzLREoRoA=" crossorigin="anonymous"></script> -->
<script type="text/javascript" src="{% static "plugins/material-preloader/js/materialPreloader.min.js" %}"></script>
<!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.1/js/materialize.min.js" integrity="sha256-3mqgTUhHNgfXgjrzjPOaW03DdQ9hgW92BApzLREoRoA=" crossorigin="anonymous"></script> -->

<script type="text/javascript" src="{% static "plugins/sweetalert/sweetalert.min.js" %}"></script>
<script type="text/javascript" src="{% static "plugins/js-cookie/js.cookie-2.1.3.min.js" %}"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.16.0/jquery.validate.min.js" integrity="sha256-UOSXsAgYN43P/oVrmU+JlHtiDGYWN2iHnJuKY9WD+Jg=" crossorigin="anonymous"></script>

<!-- Custom JS -->
<script type="text/javascript" src="{% static "js/alpha.min.js" %}"></script>
<script type="text/javascript" src="{% static "js/admin-social-linking.js" %}"></script>
<script type="text/javascript" src="{% static "onboarding/js/onboarding.js" %}"></script>
Expand Down

0 comments on commit 6d8b109

Please sign in to comment.