Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Commit

Permalink
css formatting changes
Browse files Browse the repository at this point in the history 
Merge branch 'develop'
  • Loading branch information
@ben-bougher
ben-bougher committed Nov 11, 2015
2 parents 2d9f8e1 + b587da3 commit 370b6ab
Show file tree
Hide file tree
Showing 9 changed files with 116 additions and 101 deletions.
4 changes: 4 additions & 0 deletions static/css/modelr.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,10 @@ svg {
}
/**************/

h1 {
margin-bottom: 24px;
}

.ribbon-banner {
display: block;
position: absolute;
Expand Down
20 changes: 10 additions & 10 deletions templates/1D_model.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,17 +81,17 @@
</script>

<div class="container">

<!-- banner notice about demo mode if no-one is signed in -->
{% if not user %}
<div class="alert alert-warning" style="margin-bottom: 20px" >
<strong>You are in demo mode.</strong> <a href="/signup">Sign up</a> to create custom rocks and fluids. Pricing starts at just $9 per month.
</div>
{% endif %}

<!-- main panel -->
<div class="panel panel-default">
{% if not user %}

<div class="alert alert-warning"
style="margin-bottom: 35px" >
<strong>Demo mode.</strong> <a href="/signup">
Sign up
</a>
to create rocks and save scenarios!
</div>
{% endif %}

<div class="panel-heading">
<h3 class="panel-title">Model</h3>
</div>
Expand Down
3 changes: 2 additions & 1 deletion templates/about.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
{% block content %}

<div class="container">

<div class="jumbotron">

<p style="margin-bottom:2em;"><img class="img-responsive" src="/static/img/Modelr_equation.png" alt="Geology + Modelr = Seismic" /></p>
Expand Down Expand Up @@ -44,7 +45,7 @@ <h3>Matt Hall</h3>
</div>
</div> <!-- end of bios row -->

<div style="margin-top:36px;"></div> <!-- vertical space -->
<div style="margin-top:18px;"></div> <!-- vertical space -->

<div class="panel panel-default">
<div class="panel-heading">
Expand Down
4 changes: 2 additions & 2 deletions templates/base_template.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
</li>
{% else %}
<li>
<button style="margin-left:14px; margin-right:20px;" type="button" class="btn navbar-btn" onclick="location.href='/signin'" id="signin_button">Sign in</button>
<button style="margin-left:10px; margin-right:36px;" type="button" class="btn navbar-btn" onclick="location.href='/signin'" id="signin_button">Sign in</button>
</li>
{% endif %}
</ul>
Expand Down Expand Up @@ -196,7 +196,7 @@
<a href="http://www.agilegeoscience.com/"><img src="/static/img/agile_logo.png" width="60px" /></a>
</div>
<div class="modelr-footer">
<p><a href="http://www.agilegeoscience.com/">Agile Geoscience 2014</a>&nbsp;&nbsp;&nbsp;&nbsp; <a href="/about">About</a>&nbsp;&bullet;&nbsp;<a href="/terms">Terms</a>&nbsp;&bullet;&nbsp;<a href="/privacy">Privacy</a><br />
<p><a href="http://www.agilegeoscience.com/">Agile Geoscience 2015</a>&nbsp;&nbsp;&nbsp;&nbsp; <a href="/about">About</a>&nbsp;&bullet;&nbsp;<a href="/terms">Terms</a>&nbsp;&bullet;&nbsp;<a href="/privacy">Privacy</a><br />
<span style="display:block; margin-top:3px; font-size:75%;">Modelr & the Modelr logo are trademarks of Agile&nbsp;Geoscience&nbsp;Ltd</span></p></div>
</div>
</footer>
Expand Down
85 changes: 45 additions & 40 deletions templates/demo.html
View file
Original file line number Diff line number Diff line change
@@ -1,53 +1,58 @@
{% extends "base_template.html" %}

{% block title %}Modelr &middot; Demo Mode{% endblock %}
{% block title %}Modelr &middot; Demo{% endblock %}
{% block content %}


<div class="container">

<h1>Demo Mode</h1>
<h1>Try Modelr for free</h1>

<p>
Explore our tools for free. Subscribe to build a model with your own rocks and fluids.
</p>
<p class="lead"><strong>Explore our tools for free.</strong> This is where you can try some of the modeling workflows.</p>

<p class="lead"><a href="/signup">Subscribe</a> to use your own earth models, create your own rocks and fluids, or save scenarios.</p>

<div class="container">
<div class="row">
<div class="col-sm-4 col-md-3">
<div class="panel panel-default text-center">
<div class="panel-heading">
<h3><a href="1D_model">1D Modeling </a></h3>
</div>
<div class="panel-body">
1D fluid substitution modeling.
</div>
</div>
</div>
<div class="col-sm-4 col-md-3">
<div class="panel panel-default text-center">
<div class="panel-heading">
<h3><a href="/model">2D Modeling</a></h3>
</div>
<div class="panel-body">
<p>Build a synthetic from a 2D earth model.</p>
</div>
</div>
</div>
<div class="col-sm-4 col-md-3">
<div class="panel panel-default text-center">
<div class="panel-heading">
<h3><a href="/scenario"> Scenario </a></h3>
</div>
<div class="panel-body">
<p>Script based modeling of different wedge and AVO scenarios.</p>
</div>
</div>
</div>

<div class="container">

<div class="row">

<div class="col-lg-offset-3 col-md-4 col-lg-2">
<div class="panel panel-default text-center">
<div class="panel-heading">
<h3><a href="1D_model">1D modeling </a></h3>
</div>
<div class="panel-body">
<p>1D synthetics and fluid substitution modeling.</p>
</div>
</div>
</div>

<div class="col-md-4 col-lg-2">
<div class="panel panel-default text-center">
<div class="panel-heading">
<h3><a href="/model">2D modeling</a></h3>
</div>
<div class="panel-body">
<p>Build a synthetic section from a 2D earth model.</p>
</div>
</div>
</div>
</div>

<div class="col-md-4 col-lg-2">
<div class="panel panel-default text-center">
<div class="panel-heading">
<h3><a href="/scenario">Scenario models</a></h3>
</div>
<div class="panel-body">
<p>Script-based models of various wedge and AVO scenarios.</p>
</div>
</div>
</div>

</div><!-- end row -->

</div> <!-- end inner container -->

</div>
</div><!-- end main container -->

{% endblock %}
42 changes: 36 additions & 6 deletions templates/help.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,16 +157,44 @@ <h4 class="panel-title">
</div>
</div>

<div style="margin-top:36px;"></div>
<div class="row">
<h4>More help</h4>
<ul>
<li><a href="/help/drawing">Help with drawing models</a></li>
<li><a href="/help/inspecting_models">How to inspect your model</a></li>
<li><a href="http://subsurfwiki.org/wiki/Category:Modelr">Pages about Modelr in SubSurfWiki</a></li>
<li>To come: videos</li>
</ul>
</div>

<div class="row">
<h4>Sign up for occasional news about Modelr</h4>

<!-- Begin MailChimp Signup Form -->
<div class="form-group col-xs-12 col-sm-8 col-md-6 col-sm-offset-2 col-md-offset-3" style="margin-top:2.5em; margin-bottom:2em;">
<div class="form-inline">
<form action="https://agilegeoscience.us6.list-manage.com/subscribe/post?u=3e1e2cd71eeb0422366e88354&amp;id=3a00d839f5" method="post" id="mc-embedded-subscribe-form" name="mc-embedded-subscribe-form" class="form-horizontal" target="_blank" novalidate>
<div class="col-xs-8 col-sm-10">
<div class="input-group">
<span class="input-group-addon"><span class="glyphicon glyphicon-envelope" style="color:gray;"></span></span>
<input type="email" value="" name="EMAIL" class="form-control email" id="mce-EMAIL" placeholder="Keep in touch!" required>
</div>

<!-- real people should not fill this in and expect good things - do not remove this or risk form bot signups-->
<div style="position: absolute; left: -5000px;">
<input type="text" name="b_3e1e2cd71eeb0422366e88354_3a00d839f5" value="">
</div>
</div>
<div class="col-xs-offset-8 col-sm-offset-10">
<input type="submit" value="Get notified" style="color:gray;" name="subscribe" id="mc-embedded-subscribe" class="btn btn-default">
</div>
</form>
</div>
</div><!-- end of form-group -->
<!--End mc_embed_signup-->
</div>

<div style="margin-top:36px;"></div>
<div class="row">
<h4>Can't figure something out? Got a bright idea? Get in touch...</h4>

<div class="col-md-8" style="margin-top:18px;">
Expand All @@ -177,7 +205,7 @@ <h4>Can't figure something out? Got a bright idea? Get in touch...</h4>
<label for="name" class="col-sm-2 control-label">Email</label>
<div class="col-sm-offset-2">
<input class="form-control" type="email" name="email"
value={{user.email}}>
value={{user.email}}>
</div>
</div>

Expand All @@ -191,13 +219,15 @@ <h4>Can't figure something out? Got a bright idea? Get in touch...</h4>
<div class="form-group">
<div class="col-sm-offset-2">
<input class="btn btn-primary btn-lg" type="submit"
value="Send your message">
value="Send your message">
</div>
</div>

</form>
</div>
</div>
</div>
</div><!-- end of this block -->

</div><!-- end of main container -->

{% endblock %}

28 changes: 2 additions & 26 deletions templates/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,15 @@
{% block title %}Modelr{% endblock %}
{% block content %}



<!-- Carousel
================================================== -->
<div style="margin-top:48px"></div>

<div id="modelrCarousel" class="carousel slide hidden-xs" data-ride="carousel">

<!-- Indicators -->
<ol class="carousel-indicators">
<li data-target="#modelrCarousel" data-slide-to="0"
class="active"></li>
<li data-target="#modelrCarousel" data-slide-to="0" class="active"></li>
<li data-target="#modelrCarousel" data-slide-to="1"></li>
<li data-target="#modelrCarousel" data-slide-to="2"></li>
</ol>
Expand Down Expand Up @@ -87,28 +85,6 @@ <h4>Modelr is a web app, and works in any browser.
</p>
</div>


<!-- Begin MailChimp Signup Form -->
<div class="form-group col-xs-12 col-sm-8 col-md-6 col-sm-offset-2 col-md-offset-3" style="margin-top:2.5em; margin-bottom:2em;">
<div class="form-inline">
<form action="https://agilegeoscience.us6.list-manage.com/subscribe/post?u=3e1e2cd71eeb0422366e88354&amp;id=3a00d839f5" method="post" id="mc-embedded-subscribe-form" name="mc-embedded-subscribe-form" class="form-horizontal" target="_blank" novalidate>
<div class="col-xs-8 col-sm-10">
<div class="input-group">
<span class="input-group-addon"><span class="glyphicon glyphicon-envelope" style="color:gray;"></span></span>
<input type="email" value="" name="EMAIL" class="form-control email" id="mce-EMAIL" placeholder="Keep in touch!" required>
</div>
<!-- real people should not fill this in and expect good things - do not remove this or risk form bot signups-->
<div style="position: absolute; left: -5000px;"><input type="text" name="b_3e1e2cd71eeb0422366e88354_3a00d839f5" value=""></div>
</div>
<div class="col-xs-offset-8 col-sm-offset-10">
<input type="submit" value="Get notified" style="color:gray;" name="subscribe" id="mc-embedded-subscribe" class="btn btn-default">
</div>
</form>
</div>
</div>
<!--End mc_embed_signup-->


<script src="/static/js/carousel.js"></script>
<script src="/static/js/transition.js"></script>

Expand Down
29 changes: 14 additions & 15 deletions templates/model2.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,16 @@
{% block content %}

<div ng-cloak class="container" ng-controller="2DCtrl">

<!-- banner notice about demo mode if no-one is signed in -->
{% if not user %}
<div class="alert alert-warning" style="margin-bottom: 20px" >
<strong>You are in demo mode.</strong> <a href="/signup">Sign up</a> to create earth models, make custom rocks and fluids, and save scenarios. Pricing starts at just $9 per month.
</div>
{% endif %}

<!-- main panel -->
<div class="panel panel-default">
{% if not user %}

<div class="alert alert-warning"
style="margin-bottom: 35px" >
<strong>Demo mode.</strong> <a href="/signup">
Sign up
</a>
to create rocks and save scenarios!
</div>
{% endif %}
<div class="panel-heading">
<h3 class="panel-title">Model</h3>
</div>
Expand All @@ -27,7 +26,7 @@ <h3 class="panel-title">Model</h3>

<!-- INFO SPAN -->
<span title="{[popover.title]}" data-content="{[popover.content]}"
class="glyphicon glyphicon-info-sign model_info" data-animation="am-flip-x"
class="glyphicon glyphicon-info-sign model_info" data-animation="am-fade"
data-auto-close="1" data-trigger="hover" bs-popover>
</span>

Expand All @@ -37,10 +36,10 @@ <h3 class="panel-title">Model</h3>
<input type="submit" name="submit" value="Submit" id="submit">
<input id="file" type="file" name="file" ng-model="file" onchange="$('#submit').click()"/>
</div>
<div class="btn btn-info" id="upload_btn" onclick="$('#file').click()"
<button class="btn btn-info" id="upload_btn" onclick="$('#file').click()"
{% if not user %} disabled {% endif %}>
Upload image
</div>
</button>
<button type="button" class="btn btn-info"
onclick="window.location.href='/model_builder'"
{% if not user %} disabled {% endif %}>
Expand Down Expand Up @@ -128,7 +127,7 @@ <h4><span class="label label-default">z-range of model</span></h4>
<!-- RESULTS PANEL -->
<div class="panel panel-default" id="plot_header">
<div class="panel-heading">
<h3 class="panel-title">Result (Drag the wiggles or horizons)</h3>
<h3 class="panel-title">Result — drag the wiggles or horizons!</h3>
</div>
<div class="panel-body">
<img class="col-xs-12" style="height: 300px; display:none;" id="loader" src="/static/img/ajax-loader.gif" />
Expand Down Expand Up @@ -278,7 +277,7 @@ <h3 class="panel-title">Metadata</h3>
<tr>
<th></th>
<th class="text-right" style="padding:0 8px 0 0;">Z<br/><span style="color:lightgrey; font-weight:normal;">Pa·s·m<sup>−1</sup></span></th>
<th style="text-align:right; padding:0 8px 0 0;">PR<br/><span></span></th>
<th style="text-align:right; padding:0 8px 0 0;">PR<br/><span>&nbsp;</span></th>
<th style="text-align:right; padding:0 8px 0 0;">E<br /><span style="color:lightgrey; font-weight:normal;">GPa</span></th>
<th style="text-align:right; padding:0 8px 0 0;">&lambda;<br /><span style="color:lightgrey; font-weight:normal;">GPa</span></th>
<th style="text-align:right; padding:0 8px 0 0;">&mu;<br /><span style="color:lightgrey; font-weight:normal;">GPa</span></th>
Expand Down
2 changes: 1 addition & 1 deletion templates/scenario.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@ <h3 class="panel-title">Result</h3>
src="/static/img/ajax-loader.gif" />
</div>
</div> <!-- end of panel-body -->
</div> <!-- end of panel -->

<div class="panel panel-default">
<div class="panel-heading">
Expand All @@ -206,7 +207,6 @@ <h3 class="panel-title">Metadata</h3>
<div id="model_metadata"></div>

</div> <!-- end of panel body -->
</div> <!-- end of panel -->
</div> <!-- end of panel -->

</div> <!-- end of column div -->
Expand Down

0 comments on commit 370b6ab

Please sign in to comment.