Skip to content

Commit

Permalink
Merge pull request #112 from ElDeveloper/madne-css
Browse files Browse the repository at this point in the history 
Revamp GUI to be homogeneous
  • Loading branch information
@antgonza
antgonza committed Jun 19, 2014
2 parents baf3432 + 7fde585 commit 4491e7c
Show file tree
Hide file tree
Showing 7 changed files with 125 additions and 171 deletions.
72 changes: 0 additions & 72 deletions qiita_pet/static/css/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,75 +2,3 @@
padding: 20px;
}

/* navbar code from http://line25.com/tutorials/how-to-create-a-pure-css-dropdown-menu */
nav {
padding: 0px;
margin: 0px;
font-size: 18px;
text-align: center;
}

nav ul ul {
display: none;
}

nav ul li:hover > ul {
display: block;
}


nav ul {
background: #A7A9AC;
padding: 0 20px;
list-style: none;
position: relative;
}
nav ul:after {
content: "";
clear: both;
display: block;
}

nav ul li {
float: left;
}
nav ul li:hover {
background: #999;
}
nav ul li:hover a {
color: #000;
}

nav ul li a {
display: block;
padding: 10px 10px;
color: #000;
text-decoration: none;

}


nav ul ul {
background: #999;
border-radius: 0px;
padding: 0;
position: absolute; top: 100%;
}
nav ul ul li {
float: none;
border-top: 1px solid #999;
border-bottom: 1px solid #999;
position: relative;
}
nav ul ul li a {
padding: 10px 10px;
color: #000;
}
nav ul ul li a:hover {
background: #888;
}

nav ul ul ul {
position: absolute; left: 100%;
top:0;
}
Binary file added qiita_pet/static/img/favicon.ico
View file
Binary file not shown.
Binary file added qiita_pet/static/img/logo-clear.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified qiita_pet/static/img/logo.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 0 additions & 21 deletions qiita_pet/templates/create_analysis.html
View file

This file was deleted.

13 changes: 11 additions & 2 deletions qiita_pet/templates/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,15 @@

{%block content %}
<div class="jumbotron">
<h2>Welcome to Qiita.</h2>
<h1>Welcome to Qiita</h1>
<p align="justify">
Qiita is a development effort powering the data analysis and storage for the Human Microbiome Project phase two of the Human Microbiome Project, a new three-year "multi-omic" study investigating the roles played by microbes and their interactions with the human body. Using inflammatory bowel disease as our focus, this project will delve into the relationship between the microbiome and disease.
</p>
</ br>
<p align="right">
<small>
<i>Text taken from <a href="https://ibdmdb.org">https://ibdmdb.org</a>.</i>
</small>
</p>
</div>
{% end %}
{% end %}
190 changes: 114 additions & 76 deletions qiita_pet/templates/sitebase.html
View file
Original file line number Diff line number Diff line change
@@ -1,86 +1,124 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
<head>
<title>Qiita</title>
<link rel="stylesheet" href="/static/vendor/css/bootstrap.min.css" type="text/css">
<link rel="stylesheet" href="/static/vendor/css/bootstrap-theme.min.css" type="text/css">
<link rel="stylesheet" href="/static/css/style.css" type="text/css">
<head>
<title>Qiita</title>
<link rel="stylesheet" href="/static/vendor/css/bootstrap.min.css" type="text/css">
<link rel="stylesheet" href="/static/vendor/css/bootstrap-theme.min.css" type="text/css">
<link rel="stylesheet" href="/static/css/style.css" type="text/css">

<script src="/static/vendor/js/jquery-2.1.0.min.js"></script>
<script src="/static/vendor/js/bootstrap.min.js"></script>
<script src="/static/vendor/js/dropdown.min.js"></script>
<script src="/static/vendor/js/jquery-2.1.0.min.js"></script>
<script src="/static/vendor/js/bootstrap.min.js"></script>

{% block head %}{% end %}
</head>
<body>
<link rel="shortcut icon" href="/static/img/favicon.ico">

<table width='100%' border="0" style="background:#A7A9AC">
<tr style="padding-top:3px; padding-bottom:3px; padding-right:3px; padding-left:3px;">
<td width="15%"><img src="/static/img/logo.png"></td>
<td width="60%" style="text-align:center;">
<nav>
<ul>
<li><a href="/">Home</a></li>
{% if user != '' %}
<li>
<a href="/analysis/1" target="_parent">Meta Analysis</a>
<ul>
<li><a href="/analysis/1" target="_parent">New Meta-Analysis</a></li>
<li><a href="/running/" target="_parent">Running Meta-Analyses</a></li>
</ul>
</li>
<!--
<li>
<a href="" target="_parent">Tools</a>
</li>
-->
{% end %}
<li><a href="mailto:qiita.help@gmail.com" target="_blank">Help</a></li>
</ul>
</nav>
</td>
<td width="45%" id="study_info">
{% if user %}
<div class="nav navbar-nav navbar-right" style="color: white;">Welcome <a href="/profile/">{{user}}</a> | <a href="/auth/logout/">Log Out</a></div>
{% else %}
<div class="nav">
{% try %}
<span style="color: red;">{{loginerror}}</span>
{% except %}
</span>
{% end %}
<form class="navbar-form" role="form" action="/auth/login/" method="post">
<table width="100%">
<tr>
<td>
<div class="form-group">
<input type="text" id="username" name="username" placeholder="Email" class="form-control">
{% block head %}{% end %}
</head>
<body style="padding-top: 65px;">
<div class="navbar navbar-inverse navbar-fixed-top" role="navigation">
<div class="container">
<div class="navbar-header">
<!-- button that appears if the window is re-sized to a smaller size -->
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
</div>
</td>
<td>
<div class="form-group">
<input type="password" id="password" name="password" placeholder="Password" class="form-control">
</div>
</td>
<td>
<button type="submit" class="btn btn-success">Sign in</button>
</td>
</tr>
</table>
</form>
<a href="/auth/create/">New User</a> | <a href="/forgot/">Forgot Password</a>

<div class="navbar-collapse collapse">
<ul class="nav navbar-nav">
<li>
<!-- qiita logo -->
<a class="navbar-brand" rel="home" href="/" title="Qiita">
<img style="max-width:100px; margin-top: -7px;" src="/static/img/logo-clear.png">
</a>
</li>
<!-- meta-analysis menu -->
{% if user != '' %}
<li class="dropdown">
<a href="/analysis/1" data-toggle="dropdown" class="dropdown-toggle">Meta Analysis<b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a data-toggle="modal" data-target="#create-analysis-modal-view">Create Meta Analysis</a></li>
<li><a href="#">See Running Analyses</a></li>
<li><a href="#">See Old Analyses</a>
</ul>
</li>
{% end %}
<!-- generic elements -->
<li>
<a href="#">Help</a>
</li>
<li>
<a href="http://github.com/biocore/qiita">GitHub</a>
</li>
</ul>
<!-- show user name and logout button if there's a user logged in -->
{% if user %}
<ul class="nav navbar-nav pull-right">
<li>
<a href="/profile/">Welcome {{user}}</a>
</li>
<li class="pull-right">
<a href="/auth/logout/">Log Out</a>
</li>
</ul>
<!-- otherwise show the login form -->
{% else %}
{% try %}
<span style="color: red;">{{loginerror}}</span>
{% except %}
</span>
{% end %}
<form class="navbar-form navbar-right" role="form" action="/auth/login/" method="post">
<div class="form-group">
<input type="text" id="username" name="username" placeholder="Email" class="form-control">
</div>
<div class="form-group">
<input type="password" id="password" name="password" placeholder="Password" class="form-control">
</div>
<button type="submit" class="btn btn-success">Sign in</button>
</form>
{% end %}
</div><!--/.navbar-collapse -->
</div>
{%end%}
</td>
</tr>
</table>
</div> <!--/.main nav-bar -->

<div id="template-content">
{% block content %}{% end %}
</div>
<!-- all templates should override this portion to present their main content -->
<div id="template-content" class="container">
{% block content %}{% end %}
</div>

<div id="footer">
</div>
<!-- modal view to enter analysis information -->
<div class="modal fade" id="create-analysis-modal-view" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title" id="myModalLabel">Create new meta-analysis</h4>
</div>
<form role="form" action="/analysis/2" method="post">
<div class="modal-body">
<div>
<div class="form-group">
<label for="name">Analysis name</label>
<input type="text" class="form-control" id="name" name="name" placeholder="Analysis name">
</div>
<div class="form-group">
<label for="description">Description</label>
<input type="text" class="form-control" id="description" name="description" placeholder="Short description">
</div>
</div>
</div>
<div class="modal-footer">
<button type="submit" class="btn btn-primary">Create analysis</button>
</div>
</form>
</div>
</div>
</div>

</body>
</html>
<div id="footer">
</div>
</body>
</html>

0 comments on commit 4491e7c

Please sign in to comment.