Skip to content

Commit

Permalink
Merge pull request #105 from ruchidesai/fix-paralax
Browse files Browse the repository at this point in the history
Merged fix for issue #44
  • Loading branch information
indera committed Aug 17, 2015
2 parents d42e772 + 396691c commit bb013f4
Show file tree
Hide file tree
Showing 9 changed files with 245 additions and 54 deletions.
15 changes: 15 additions & 0 deletions app/redidropper/static/css/layout.css
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,15 @@
z-index:80002; /* ensures box appears above overlay */
}

.red-background {
background-color: #a51a11;
}

a.logo-name:hover, a.logo-name:active,
ul.sidebar-nav li a:hover, ul.sidebar-nav li a:active {
color: #FFF !important;
}

th.header {
background-image: url(/static/img/small.gif);
background-repeat: no-repeat;
Expand Down Expand Up @@ -49,6 +58,12 @@ table.borderless td, table.borderless th {
border: solid 1px black;
}

.login-form-container {
margin-top: 3em;
padding: 3em;
background-color: #a51a11;
}

.footer {
min-height: 40px;
padding-top: 5px;
Expand Down
57 changes: 57 additions & 0 deletions app/redidropper/static/css/parallax.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
/* ==============================================================================================
This copyright notice must be kept untouched in the stylesheet at all times.
The original version of this stylesheet and the associated (x)html
is available at http://www.script-tutorials.com/bootstrap-one-page-template-with-parallax-effect/
Copyright (c) Script Tutorials. All rights reserved.
This stylesheet and the associated (x)html may be modified in any way to fit your requirements.
================================================================================================= */

/* padded section */
.pad-section {
padding: 50px 0;
}

/* additional sections */
#home {
background: url(/static/img/bottles.jpg) no-repeat center center fixed;
display: table;
height: 50vh;
position: relative;
width: 100%;
-webkit-background-size: cover;
-moz-background-size: cover;
-o-background-size: cover;
background-size: cover;
}

#about {
}

#services {
background-color: #a51a11;
color: #ffffff;
}

#services .glyphicon {
border: 2px solid #FFFFFF;
border-radius: 50%;
display: inline-block;
font-size: 60px;
height: 140px;
line-height: 140px;
text-align: center;
vertical-align: middle;
width: 140px;
}

#information {
background: url(/static/img/oil.jpg) no-repeat center center fixed;
display: table;
height: 300px;
position: relative;
width: 100%;
background-size: cover;
}
#information .panel {
opacity: 0.85;
}
Binary file not shown.
Binary file not shown.
Binary file added app/redidropper/static/img/bottles.jpg
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 app/redidropper/static/img/oil.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
124 changes: 87 additions & 37 deletions app/redidropper/templates/index.html
Original file line number Diff line number Diff line change
@@ -1,50 +1,100 @@
{% extends "layout.html" %}
{% import 'macros.html' as macros %}

{% block login %}
{% call macros.render_form(form,
action_url=url_for('index'),
action_text='Login',
btn_class='btn btn-default',
class_='navbar-form navbar-right') %}
{{ macros.render_field(form.email,
label_visible=false,
placeholder='Email Address',
autocomplete='on',
type='email') }}
{{ macros.render_field(form.password,
label_visible=false,
placeholder='Password',
type='password') }}
{{ macros.render_field(form.next,
value=next_page,
type='hidden') }}
{{ macros.render_field(form.next,
value=next_page,
type='hidden') }}
{% endcall %}
{% endblock %}

{% block content %}
<div class="container">
<div class="row">
<div class="col-sm-6">
<div class="starter-template">
<h1>Welcome! </h1>
<p class="lead">Please Sign In.</p>

<!-- first section - login -->
<div id="home">
</div>
<!-- /first section -->

<div class="row">
<div class="col-xs-12 col-md-4 col-sm-4 col-sm-offset-4 col-md-offset-4
col-lg-4 col-lg-offset-4">
{% call macros.render_form(form,
action_url=url_for('index'),
action_text='Login',
btn_class='btn btn-danger',
class_='login-form') %}
{{ macros.render_field(form.email,
label_visible=false,
placeholder='Emai Address',
autocomplete='on',
type='email') }}
{{ macros.render_field(form.password,
label_visible=false,
placeholder='Password',
type='password') }}
{{ macros.render_field(form.next,
value=next_page,
type='hidden') }}
{{ macros.render_field(form.next,
value=next_page,
type='hidden') }}

{% endcall %}
<!-- second section - About -->
<div id="about" class="pad-section">
<div class="container">
<div class="row">
<div class="col-sm-12 text-center">
<h2>What is RED-I Dropper?</h2>
<p class="lead">
RED-I Dropper is a web-based application used to assist in the secure transport of data from one location to another. This transfer can include both sensitive and non-sensitive data.</p>
</div>
</div>
</div>
</div>
</div>
<!-- /second section -->

<!-- third section - Services -->
<div id="services" class="pad-section">
<div class="container">
<h2 class="text-center">Dropper Resources</h2> <hr />
<div class="row text-center">
<div class="col-sm-4 col-xs-6">
<i class="glyphicon glyphicon-cloud"> </i>
<h4>Getting Started</h4>
<p></p>
</div>
<div class="col-sm-4 col-xs-6">
<i class="glyphicon glyphicon-phone-alt"> </i>
<h4>Support</h4>
<p></p>
</div>
<div class="col-sm-4 col-xs-6">
<i class="glyphicon glyphicon-bullhorn"> </i>
<h4>FAQ</h4>
<p></p>
</div>
</div>
</div>
<div class="col-sm-6 text-center">
<h2>What is RED-I Dropper?</h2>
<p class="lead">
RED-I Dropper is a web-based application used to assist in the secure transport of data from one location to another. This transfer can include both sensitive and non-sensitive data.</p>
</div>
<!-- /third section -->

<!-- fourth section - Information -->
<div id="information" class="pad-section">
<div class="container">
<div class="row">
<div class="col-sm-12">
<div class="panel panel-default">
<div class="panel-heading">
<h2 class="panel-title">STAR</h2>
</div>
<div class="panel-body lead">
RED-I Dropper is a component of the Software Toolset for Alzheimer's
Research (STAR) system created in conjunction with the Alzheimer's
Disease Research Consortium. STAR is a cloud of technology services
created by CTSI-IT that serves to orchestrate the capture of data and
metadata as it flows from each consortium member to form a dataset
for analysis that will advance the understanding of Alzheimer's
Disease.
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<!-- /fourth section -->


{% endblock %}
14 changes: 11 additions & 3 deletions app/redidropper/templates/layout.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<link href="{{ url_for('static', filename='css/sidebar.css') }}" rel="stylesheet">
<link href="{{ url_for('static', filename='css/layout.css') }}" rel="stylesheet">
<link href="{{ url_for('static', filename='css/start_upload.css') }}" rel="stylesheet">
<link href="{{ url_for('static', filename='css/parallax.css') }}" rel="stylesheet">
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">


Expand All @@ -29,7 +30,13 @@
<script src="{{ url_for('static', filename='js/sidebar.js') }}"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/react/0.13.1/react.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/react/0.13.1/JSXTransformer.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.4/js/bootstrap.min.js"> </script>
<script src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.5/js/bootstrap.min.js"> </script>
<!--
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.5/fonts/glyphicons-halflings-regular.eot" charset="utf-8">
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.5/fonts/glyphicons-halflings-regular.svg" charset="utf-8">
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.5/fonts/glyphicons-halflings-regular.ttf" charset="utf-8">
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.5/fonts/glyphicons-halflings-regular.woff" charset="utf-8">
-->

{% block scripts %}
<!-- allow to insert page specific js -->
Expand All @@ -44,7 +51,7 @@
{%endif%}

<!-- Sidebar -->
<div id="sidebar-wrapper" class="bg-primary">
<div id="sidebar-wrapper" class="bg-primary red-background">
<ul class="sidebar-nav">
{% for link in user_links %}
{{ render_nav_link(link[0], link[1]) }}
Expand All @@ -54,7 +61,7 @@

<div id="page-content-wrapper">
<nav class="navbar">
<div class="container-fluid bg-primary">
<div class="container-fluid bg-primary red-background">
<div class="navbar-header">
<div class="navbar-brand" href="/">
{% if current_user.is_authenticated() %}
Expand All @@ -65,6 +72,7 @@
<a class="logo-name" href="/">Redi Dropper</a>
</div>
</div>
<p>{% block login %} {% endblock %}</p>
</div>
</nav>
<div class="col-sm-12 col-md-12 col-lg-12 main-content">
Expand Down
89 changes: 75 additions & 14 deletions app/redidropper/templates/login_shib.html
Original file line number Diff line number Diff line change
@@ -1,23 +1,84 @@
{% extends "layout.html" %}
{% import 'macros.html' as macros %}

{% block login %}
{% call macros.render_form(form,
action_url=url_for('shibb_redirect'),
action_text='Login',
btn_class='btn btn-default',
class_='navbar-right') %}
{% endcall %}
{% endblock %}

{% block content %}

<div class="starter-template">
<h1>Welcome! </h1>
<p class="lead">This is the REDI Dropper Application. Please login.</p>
</div>
<!-- first section - Home -->
<div id="home">
</div>
<!-- /first section -->

<!-- second section - About -->
<div id="about" class="pad-section">
<div class="container">
<div class="row">
<div class="col-sm-12 text-center">
<h2>What is RED-I Dropper?</h2>
<p class="lead">
RED-I Dropper is a web-based application used to assist in the secure transport of data from one location to another. This transfer can include both sensitive and non-sensitive data.</p>
</div>
</div>
</div>
</div>
<!-- /second section -->

<!-- third section - Services -->
<div id="services" class="pad-section">
<div class="container">
<h2 class="text-center">Dropper Resources</h2> <hr />
<div class="row text-center">
<div class="col-sm-4 col-xs-6">
<i class="glyphicon glyphicon-cloud"> </i>
<h4>Getting Started</h4>
<p></p>
</div>
<div class="col-sm-4 col-xs-6">
<i class="glyphicon glyphicon-phone-alt"> </i>
<h4>Support</h4>
<p></p>
</div>
<div class="col-sm-4 col-xs-6">
<i class="glyphicon glyphicon-bullhorn"> </i>
<h4>FAQ</h4>
<p></p>
</div>
</div>
</div>
</div>
<!-- /third section -->

<div class="row">
<div class="col-xs-12 col-md-4 col-sm-4 col-sm-offset-4 col-md-offset-4
col-lg-4 col-lg-offset-4">
{% call macros.render_form(form,
action_url=url_for('shibb_redirect'),
action_text='Login',
btn_class='btn btn-danger',
class_='login-form') %}
{% endcall %}
<!-- fourth section - Information -->
<div id="information" class="pad-section">
<div class="container">
<div class="row">
<div class="col-sm-12">
<div class="panel panel-default">
<div class="panel-heading">
<h2 class="panel-title">STAR</h2>
</div>
<div class="panel-body lead">
RED-I Dropper is a component of the Software Toolset for Alzheimer's
Research (STAR) system created in conjunction with the Alzheimer's
Disease Research Consortium. STAR is a cloud of technology services
created by CTSI-IT that serves to orchestrate the capture of data and
metadata as it flows from each consortium member to form a dataset
for analysis that will advance the understanding of Alzheimer's
Disease.
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<!-- /fourth section -->

{% endblock %}

0 comments on commit bb013f4

Please sign in to comment.