Skip to content

Update sitebase for portals #1650

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 19, 2016
Merged

Update sitebase for portals #1650

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0ab325
update sitebase for portals
squirrelo Feb 19, 2016
23afbde
move to raw output
squirrelo Feb 19, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 37 additions & 37 deletions qiita_pet/templates/sitebase.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,25 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
<head>
<title>{{portal_styling.title}}</title>
<link rel="stylesheet" href="/static/vendor/css/jquery-ui.min.css" type="text/css">
<link rel="stylesheet" href="/static/vendor/css/jquery-ui.structure.min.css" type="text/css">
<link rel="stylesheet" href="/static/vendor/css/jquery-ui.theme.min.css" type="text/css">
<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/vendor/css/chosen.css" type="text/css">
<link rel="stylesheet" href="/static/css/style.css" type="text/css">
<link rel="stylesheet" href="{% raw qiita_config.portal_dir %}/static/vendor/css/jquery-ui.min.css" type="text/css">
<link rel="stylesheet" href="{% raw qiita_config.portal_dir %}/static/vendor/css/jquery-ui.structure.min.css" type="text/css">
<link rel="stylesheet" href="{% raw qiita_config.portal_dir %}/static/vendor/css/jquery-ui.theme.min.css" type="text/css">
<link rel="stylesheet" href="{% raw qiita_config.portal_dir %}/static/vendor/css/bootstrap.min.css" type="text/css">
<link rel="stylesheet" href="{% raw qiita_config.portal_dir %}/static/vendor/css/bootstrap-theme.min.css" type="text/css">
<link rel="stylesheet" href="{% raw qiita_config.portal_dir %}/static/vendor/css/chosen.css" type="text/css">
<link rel="stylesheet" href="{% raw qiita_config.portal_dir %}/static/css/style.css" type="text/css">
{% if portal_styling.custom_css %}
<style type="text/css">
{% raw portal_styling.custom_css %}
</style>
{% end %}
<script src="/static/vendor/js/jquery-2.1.0.min.js"></script>
<script src="/static/vendor/js/jquery-ui.min.js"></script>
<script src="/static/vendor/js/bootstrap.min.js"></script>
<script src="/static/vendor/js/chosen.jquery.min.js"></script>
<script src="/static/js/qiita.js"></script>
<script src="{% raw qiita_config.portal_dir %}/static/vendor/js/jquery-2.1.0.min.js"></script>
<script src="{% raw qiita_config.portal_dir %}/static/vendor/js/jquery-ui.min.js"></script>
<script src="{% raw qiita_config.portal_dir %}/static/vendor/js/bootstrap.min.js"></script>
<script src="{% raw qiita_config.portal_dir %}/static/vendor/js/chosen.jquery.min.js"></script>
<script src="{% raw qiita_config.portal_dir %}/static/js/qiita.js"></script>

<link rel="shortcut icon" href="/static/img/favicon.ico">
<link rel="shortcut icon" href="{% raw qiita_config.portal_dir %}/static/img/favicon.ico">

<script>
function overlay_check() {
Expand Down Expand Up @@ -64,14 +64,14 @@
}

$(document).ready(function() {
$.getJSON("/analysis/dflt/sumary/", function(result) {
$.getJSON("{% raw qiita_config.portal_dir %}/analysis/dflt/sumary/", function(result) {
if(parseInt(result.studies) > 0) {
$('#dflt-sel-info').css('color', 'rgb(0, 160, 0)');
}
});
// Load default analysis summary data when displayed in menu
$("#dflt-sel-info").mouseover(function() {
$.getJSON("/analysis/dflt/sumary/", function(result) {
$.getJSON("{% raw qiita_config.portal_dir %}/analysis/dflt/sumary/", function(result) {
$("#dflt-study-count").text(result.studies);
$("#dflt-pd-count").text(result.processed_data);
$("#dflt-samp-count").text(result.samples);
Expand All @@ -82,7 +82,7 @@
$.getJSON("/analysis/dflt/sumary/", function(result){
if(parseInt(result.studies) > 0){
$("#selected_samples_menu").removeClass('disabled');
$("#selected_samples_link").attr('href', '/analysis/selected/');
$("#selected_samples_link").attr('href', '{% raw qiita_config.portal_dir %}/analysis/selected/');
}
else{
$("#selected_samples_menu").addClass('disabled');
Expand Down Expand Up @@ -134,44 +134,44 @@
<ul class="nav navbar-nav">
<li>
<!-- qiita logo -->
<a class="navbar-brand" rel="home" href="/" title="{{portal_styling.title}}">
<img style="max-width:100px; margin-top: -7px;" src="{{portal_styling.logo}}">
<a class="navbar-brand" rel="home" href="{% raw qiita_config.portal_dir %}/" title="{{portal_styling.title}}">
<img style="max-width:100px; margin-top: -7px;" src="{% raw qiita_config.portal_dir %}{{portal_styling.logo}}">
</a>
</li>
<!-- analysis menu -->
{% if user %}
<li class="dropdown">
<a href="#" data-toggle="dropdown" class="dropdown-toggle" id="analysis-drop-down">Analysis<b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="/study/list/">Create new analysis</a>
<li id="selected_samples_menu"><a id="selected_samples_link" href="/analysis/selected/">Create From Selected Samples</a></li>
<li><a href="/analysis/show/">See Previous Analyses</a></li>
<li><a href="{% raw qiita_config.portal_dir %}/study/list/">Create new analysis</a>
<li id="selected_samples_menu"><a id="selected_samples_link" href="{% raw qiita_config.portal_dir %}/analysis/selected/">Create From Selected Samples</a></li>
<li><a href="{% raw qiita_config.portal_dir %}/analysis/show/">See Previous Analyses</a></li>
</ul>
</li>
<li class="dropdown">
<a href="#" data-toggle="dropdown" class="dropdown-toggle">Study<b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="/study/create/">Create Study</a></li>
<li><a href="/study/list/">View Studies</a></li>
<li><a href="{% raw qiita_config.portal_dir %}/study/create/">Create Study</a></li>
<li><a href="{% raw qiita_config.portal_dir %}/study/list/">View Studies</a></li>
</ul>
</li>
{% set user_level = user.level %}
{% if user_level == 'admin' %}
<li class="dropdown">
<a href="#" data-toggle="dropdown" class="dropdown-toggle">Admin<b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="/admin/error/">View Errors</a></li>
<li><a href="/admin/approval/">View Studies awaiting approval</a></li>
<li><a href="{% raw qiita_config.portal_dir %}/admin/error/">View Errors</a></li>
<li><a href="{% raw qiita_config.portal_dir %}/admin/approval/">View Studies awaiting approval</a></li>
{% if qiita_config.portal == "QIITA" %}
<li><a href="/admin/portals/studies/">Edit study portal connections</a></li>
<li><a href="{% raw qiita_config.portal_dir %}/admin/portals/studies/">Edit study portal connections</a></li>
{% end %}
</ul>
</li>
{% elif user_level == 'dev' %}
<li class="dropdown">
<a href="#" data-toggle="dropdown" class="dropdown-toggle">Dev<b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="/admin/error/">View Errors</a></li>
<li><a href="{% raw qiita_config.portal_dir %}/admin/error/">View Errors</a></li>
</ul>
</li>
{% end %}
Expand All @@ -181,15 +181,15 @@
{% if user %}
<ul class="nav navbar-nav navbar-right">
<li>
<a href="/profile/">Welcome {{user.id}}</a>
<a href="{% raw qiita_config.portal_dir %}/profile/">Welcome {{user.id}}</a>
</li>
<li>
<a href="/auth/logout/">Log Out</a>
<a href="{% raw qiita_config.portal_dir %}/auth/logout/">Log Out</a>
</li>
<li class="dropdown">
{% set user_messages = current_user.messages(5) %}
{% set unread = len(current_user.unread_messages) %}
<a href="/user/messages/"><span class="glyphicon glyphicon-envelope"></span> {% if unread > 0 %}<span style="color:red">({{unread}})</span>{% end %}</a>
<a href="{% raw qiita_config.portal_dir %}/user/messages/"><span class="glyphicon glyphicon-envelope"></span> {% if unread > 0 %}<span style="color:red">({{unread}})</span>{% end %}</a>
<ul class="dropdown-menu info-menu" style="padding: 5px">
{% if user_messages %}
{% for _, um, ts, read, _ in user_messages %}
Expand All @@ -201,7 +201,7 @@
</ul>
</li>
<li class="dropdown">
<a href="/analysis/selected/" id="dflt-sel-info"><span class="glyphicon glyphicon-list-alt"></span></a>
<a href="{% raw qiita_config.portal_dir %}/analysis/selected/" id="dflt-sel-info"><span class="glyphicon glyphicon-list-alt"></span></a>
<ul class="dropdown-menu" style="padding: 5px">
<li> <span id="dflt-study-count"></span> Studies</li>
<li><span id="dflt-pd-count"></span> Processed Data</li>
Expand All @@ -213,13 +213,13 @@
{% elif maintenance is None %}
<ul class="nav navbar-nav">
<li>
<a href="/auth/forgot/">Forgot Password</a>
<a href="{% raw qiita_config.portal_dir %}/auth/forgot/">Forgot Password</a>
</li>
</ul>
<form action="/auth/create/" class="navbar-form navbar-right">
<form action="{% raw qiita_config.portal_dir %}/auth/create/" class="navbar-form navbar-right">
<input type="submit" value="Sign up" class="btn btn-info">
</form>
<form class="navbar-form navbar-right" role="form" action="/auth/login/" method="post">
<form class="navbar-form navbar-right" role="form" action="{% raw qiita_config.portal_dir %}/auth/login/" method="post">
<div class="form-group">
<input tabindex="1" type="text" id="username" name="username" placeholder="Email" class="form-control">
</div>
Expand All @@ -235,10 +235,10 @@
<a href="#" data-toggle="dropdown" class="dropdown-toggle">More Info<b class="caret"></b></a>
<ul class="dropdown-menu">
<li>
<a href="/static/doc/html/index.html">Help</a>
<a href="{% raw qiita_config.portal_dir %}/static/doc/html/index.html">Help</a>
</li>
<li>
<a href="/stats/">Stats</a>
<a href="{% raw qiita_config.portal_dir %}/stats/">Stats</a>
</li>
<li>
<a href="http://github.com/biocore/qiita">GitHub</a>
Expand Down Expand Up @@ -278,7 +278,7 @@ <h6>
Thank you for using Qiita. For citations point to <a href="http://qiita.microbio.me">http://qiita.microbio.me</a>.
</div>
<div id="overlay" class="navbar-brand" style="visibility: hidden; position: absolute; left: 0px; top: 0px; width: 100%; height: 100%; font-size: 13px; text-align: center; z-index: 1000; background-color: #333333; color: #FFFFFF;">
<img src="{{portal_styling.logo}}" alt="Qiita logo" id="small-logo"/>
<img src="{% raw qiita_config.portal_dir %}{{portal_styling.logo}}" alt="Qiita logo" id="small-logo"/>
<h1>This site only works with the following browsers</h1>
<p id="explanation"><strong>Chrome >= {{allowed_min_browser_versions['chrome']}}:</strong> You can download Chrome from <a href="https://www.google.com/chrome/browser/">here</a> or you can find instructions on how to update it <a href="https://support.google.com/chrome/answer/95414?hl=en">here</a></p>
<p id="explanation"><strong>Safari >= {{allowed_min_browser_versions['safari']}}:</strong> You can update Safari following <a href="http://support.apple.com/en-us/HT6104">these</a> instructions.</p>
Expand Down