Skip to content

Commit 3977a9a

Browse files
cboracbora
committed
views
1 parent a99a55f commit 3977a9a

10 files changed

+227
-180
lines changed

‎recastfrontend/server.py

+4
Original file line numberDiff line numberDiff line change
@@ -785,3 +785,7 @@ def analysis_number():
785785
data['analyses'] = len(analyses)
786786
data['requests'] = len(requests)
787787
return jsonify(data)
788+
789+
@app.route("/response/<int:response_id>")
790+
def response(response_id):
791+
return render_template('response.html')

‎recastfrontend/templates/analyses_views.html

+54-51
Original file line numberDiff line numberDiff line change
@@ -29,59 +29,62 @@ <h3>&nbsp;&nbsp;Analyses
2929
<br>
3030

3131
{% for analysis in analyses %}
32-
<div class="card col-md-12" style="box-shadow:0 0 0 0;">
33-
<br>
34-
<a href ="{{ url_for('.analysis', id=analysis.id) }}">
35-
<strong>{{ analysis.title }}</strong>
36-
</a>
37-
&nbsp;&nbsp;
38-
<span class="label label-primary" data-toggle="tooltip" data-placement="right" title="Collaboration">
39-
{{ analysis.collaboration }}
40-
</span>
41-
42-
<br><br>
43-
<div class="more">{{ analysis.description }}</div>
44-
<br><br>
45-
<div class="pull-left">
46-
<span class="badge">
47-
<i class="glyphicon glyphicon-user"></i>
32+
<div class="card col-md-12" style="box-shadow:1px 1px 1px 2px #f2efef;">
33+
<br>
34+
<a href ="{{ url_for('.analysis', id=analysis.id) }}">
35+
<strong>{{ analysis.title }}</strong>
36+
</a>
37+
&nbsp;&nbsp;
38+
<span class="label label-primary" data-toggle="tooltip" data-placement="right" title="Collaboration">
39+
{{ analysis.collaboration }}
40+
</span>
41+
42+
<br><br>
43+
<div class="more">{{ analysis.description }}</div>
44+
<br><br>
45+
<div class="pull-left">
46+
<span class="badge">
47+
<i class="glyphicon glyphicon-user"></i>
4848
&nbsp;{{analysis.user.name}}
49-
</span>
50-
&nbsp;&nbsp;&nbsp;&nbsp;
51-
<span class="badge">
52-
{{analysis.scan_requests[:]|length}} requests
53-
</span>
54-
&nbsp;&nbsp;
55-
<span class="badge">
56-
{{analysis.subscriptions[:]|length}} subscriptions
57-
</span>
58-
</div>
49+
</span>
50+
&nbsp;&nbsp;&nbsp;&nbsp;
51+
<span class="badge">
52+
{{analysis.scan_requests[:]|length}} requests
53+
</span>
54+
&nbsp;&nbsp;
55+
<span class="badge">
56+
{{analysis.subscriptions[:]|length}} subscriptions
57+
</span>
58+
</div>
5959

60-
<div class="pull-right">
61-
<a href="{{ url_for('.analysis', id=analysis.id) }}">
62-
<span class="label label-default">
63-
<i class="glyphicon glyphicon-eye-open"></i>
64-
&nbsp;view</span>
65-
</a>
66-
&nbsp;&nbsp;
67-
<a href="{{ url_for('.subscribe', id=analysis.id) }}">
68-
<span class="label label-default">
69-
<i class="glyphicon glyphicon-pushpin"></i>
70-
&nbsp;subscribe
71-
</span>
72-
</a>
73-
&nbsp;&nbsp;
74-
<a href="{{ url_for('.request_form', id=analysis.id) }}">
75-
<span class="label label-default">
76-
<i class="glyphicon glyphicon-plus"></i>
77-
&nbsp;add&nbsp;request
78-
</span>
79-
</a>
80-
</div>
81-
<br><br><br>
82-
</div>
83-
84-
{% endfor %}
60+
<div class="pull-right">
61+
<a href="{{ url_for('.analysis', id=analysis.id) }}">
62+
<span class="label label-default">
63+
<i class="glyphicon glyphicon-eye-open"></i>
64+
&nbsp;view</span>
65+
</a>
66+
&nbsp;&nbsp;
67+
<a href="{{ url_for('.subscribe', id=analysis.id) }}">
68+
<span class="label label-default">
69+
<i class="glyphicon glyphicon-pushpin"></i>
70+
&nbsp;subscribe
71+
</span>
72+
</a>
73+
&nbsp;&nbsp;
74+
<a href="{{ url_for('.request_form', id=analysis.id) }}">
75+
<span class="label label-default">
76+
<i class="glyphicon glyphicon-plus"></i>
77+
&nbsp;add&nbsp;request
78+
</span>
79+
</a>
80+
</div>
81+
<br><br><br>
82+
</div>
83+
<span>
84+
<br>
85+
</span>
86+
87+
{% endfor %}
8588

8689
</div>
8790
</div>

‎recastfrontend/templates/analysis_form.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
<form id="myForm" method="POST" class="form-horizontal">
88
{{ form.hidden_tag() }}
99
{{ run_condition_form.hidden_tag() }}
10-
10+
<br><br>
1111

1212
<div class="panel panel-default" id="import-data-panel">
1313
<div class="panel-heading">Import from Arxiv</div>
1414
<div class="panel-content">
1515
<br>
16-
<span class="col-md-12"> <div class="alert alert-info col-md-offset-3 col-md-8" role="alert">Tip: Use this field to automatically import data from Inspire</div>
16+
<span class="col-md-12"> <div class="alert alert-info col-md-offset-3 col-md-8" role="alert"><p class="text-center"><strong>Tip: Use this field to automatically import data from Inspire</strong></p></div>
1717
<div class="col-md-1">&nbsp;</div> </span>
1818
<br>
1919
<div class="form-group">
@@ -59,7 +59,7 @@
5959
<div class="form-group required">
6060
<label class="control-label col-md-3" for="{{ form.description.id }}"><i class="fa fa-pencil"></i>&nbsp;{{ form.description.label }}</label>
6161
<div class="col-md-offset-1 col-md-6">
62-
{{ form.description(class='form-control') }}
62+
{{ form.description(class='form-control', rows="16") }}
6363
<p class="text-muted"><small>Required.</small></p>
6464
</div>
6565
</div>
@@ -120,7 +120,7 @@
120120
<div class="form-group">
121121
<label class="control-label col-md-3" for="{{ run_condition_form.description.id }}"><i class="fa fa-pencil"></i>&nbsp;{{ run_condition_form.description.label }}</label>
122122
<div class="col-md-offset-1 col-md-6">
123-
{{ run_condition_form.description(class='form-control') }}
123+
{{ run_condition_form.description(class='form-control', rows="3") }}
124124
<p class="text-muted"><small>Optional.</small></p>
125125
</div>
126126
</div>

‎recastfrontend/templates/base.html

+107-84
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,18 @@
8383
color:red;
8484
}
8585

86+
.navbar-form input, .form-inline input {
87+
width: auto;
88+
}
89+
90+
#nav.affix {
91+
position:fixed;
92+
top: 0;
93+
width: 100%;
94+
z-index: 10;
95+
}
96+
97+
8698

8799
</style>
88100

@@ -91,57 +103,79 @@
91103

92104
<body ng-app="recastApp">
93105

94-
95-
<header>
106+
<div style="background-color:white;">
107+
<header style="background-color:white;">
96108
<!-- <nav class="navbar navbar-default" role="navigation"> -->
97-
<div>
98-
<nav class="navbar navbar-inverse navbar-custom">
99-
<div class="container-fluid">
100-
<!-- Brand and toggle get grouped for better mobile display -->
101-
<div class="navbar-header">
102-
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#recast-navigation" aria-expanded="false">
103-
<span class="sr-only">Toggle navigation</span>
104-
<span class="icon-bar"></span>
105-
<span class="icon-bar"></span>
106-
<span class="icon-bar"></span>
107-
</button>
108-
<a class="navbar-brand" href="/">RECAST</a>
109-
</div>
110-
111-
<!-- Collect the nav links, forms, and other content for toggling -->
112-
<div class="collapse navbar-collapse" id="recast-navigation">
113-
<ul class="nav navbar-nav">
114-
<li><a href="/">Home</a></li>
115-
<li><a href="/about">About</a></li>
116-
<li><a href="/analyses">Analysis Catalogue</a></li>
117-
<li><a href="/requests">Requests</a></li>
118-
{% if current_user and not current_user.is_anonymous %}
119-
<li><a href="/subscriptions">My Subscriptions</a></li>
120-
{% endif %}
121-
</ul>
122-
<form class="navbar-form navbar-left" role="search" action="/search" method="post">
123-
<div class="input-group">
124-
<div class="input-group-btn search-panel">
125-
<button name="filter" type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
126-
<span id="search_concept">Filter by</span> <span class="caret"></span>
127-
</button>
128-
<ul class="dropdown-menu" role="menu">
129-
<li><a href="#Analysis">Analysis</a></li>
130-
<li><a href="#Requests">Request</a></li>
131-
<li><a href="#Users">User</a></li>
132-
</ul>
133-
</div>
109+
110+
<div class="card container-fluid hidden-sm hidden-xs">
111+
<span class="col-md-1">
112+
</span>
113+
<span class="col-md-1">
114+
<!--<img class="card-mg im-responsive" src="https://pbs.twimg.com/profile_images/1344530309/RLangTip_400x400.png" style="height:80px;">-->
115+
<h4>(some nice logo)</h4>
116+
117+
</span>
118+
<span class="col-md-1">
119+
<span class="col-md-12">
120+
<h2><strong>recast</strong> </h2>
121+
</span>
122+
</span>
123+
<span class="col-md-3"></span>
124+
<span class="col-md-6">
125+
<!--<img style="height:120px;" class="col-md-12 img-responsive pull-right" src="http://recast.perimeterinstitute.ca/sites/all/themes/perimeter/images/lhc_tunnel.jpg" alt="LHC">-->
126+
<h4 class="text-right">A framework for extending the impact of existing analyses performed by high-energy physics experiments.</h4>
127+
</span>
128+
</div>
129+
</header>
130+
131+
<div id="nav">
132+
<nav class="navbar navbar-inverse navbar-static-top">
133+
<div class="container-fluid">
134+
<!-- Brand and toggle get grouped for better mobile display -->
135+
<div class="navbar-header">
136+
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#recast-navigation" aria-expanded="false">
137+
<span class="sr-only">Toggle navigation</span>
138+
<span class="icon-bar"></span>
139+
<span class="icon-bar"></span>
140+
<span class="icon-bar"></span>
141+
</button>
142+
<a class="navbar-brand" href="/">RECAST</a>
143+
</div>
144+
145+
<!-- Collect the nav links, forms, and other content for toggling -->
146+
<div class="collapse navbar-collapse" id="recast-navigation">
147+
<ul class="nav navbar-nav">
148+
<li><a href="/">Home</a></li>
149+
<li><a href="/about">About</a></li>
150+
<li><a href="/analyses">Analysis Catalogue</a></li>
151+
<li><a href="/requests">Requests</a></li>
152+
{% if current_user and not current_user.is_anonymous %}
153+
<li><a href="/subscriptions">My Subscriptions</a></li>
154+
{% endif %}
155+
</ul>
156+
<form class="navbar-form navbar-left hidden-md" role="search" action="/search" method="post">
157+
<div class="input-group">
158+
<div class="input-group-btn search-panel">
159+
<button name="filter" type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
160+
<span id="search_concept">Filter by</span> <span class="caret"></span>
161+
</button>
162+
<ul class="dropdown-menu" role="menu">
163+
<li><a href="#Analysis">Analysis</a></li>
164+
<li><a href="#Requests">Request</a></li>
165+
<li><a href="#Users">User</a></li>
166+
</ul>
167+
</div>
134168

135-
<input type="hidden" name="search_param" value="all" id="search_param">
136-
<input type="text" class="form-control" name="q" placeholder="Search term...">
137-
<span class="input-group-btn">
138-
<button class="btn btn-default" type="submit"><span class="glyphicon glyphicon-search"></span></button>
139-
</span>
169+
<input type="hidden" name="search_param" value="all" id="search_param">
170+
<input type="text" class="form-control" name="q" placeholder="Search term...">
171+
<span class="input-group-btn">
172+
<button class="btn btn-default" type="submit"><span class="glyphicon glyphicon-search"></span></button>
173+
</span>
140174

141-
</div>
142-
<input hidden type="text" name="filter" value="" id="filter">
143-
</form>
144-
<ul class="nav navbar-nav navbar-right">
175+
</div>
176+
<input hidden type="text" name="filter" value="" id="filter">
177+
</form>
178+
<ul class="nav navbar-nav navbar-right">
145179
<!--- current_user -->
146180
{% if current_user and not current_user.is_anonymous %}
147181
<!-- current_user and not current_user.is_anonymous() --> <!-- re-check this!! -->
@@ -150,16 +184,17 @@
150184
{% else %}
151185
<li><a href="/login"><i class="glyphicon glyphicon-log-in"></i>&nbsp;Login</a></li>
152186
{% endif %}
153-
</ul>
187+
</ul>
154188
<!--<img class="img-responsive center-block" src="http://recast.perimeterinstitute.ca/sites/all/themes/perimeter/images/lhc_tunnel.jpg" alt="LHC">-->
155-
156-
</div><!-- /.navbar-collapse -->
157-
</div><!-- /.container-fluid -->
158-
</nav>
159-
</div>
160-
</header>
189+
190+
</div><!-- /.navbar-collapse -->
191+
</div><!-- /.container-fluid -->
192+
</nav>
193+
</div>
194+
</div>
161195

162196
<div class="container-fluid">
197+
163198
<div class="row col-md-12">
164199
{% with messages = get_flashed_messages(with_categories=true) %}
165200
{% if messages %}
@@ -185,40 +220,28 @@
185220
</footer>
186221
-->
187222
<script type="text/javascript">
188-
189-
223+
190224
$(document).ready(function(e){
191-
$('.search-panel .dropdown-menu').find('a').click(function(e) {
192-
e.preventDefault();
193-
var param = $(this).attr("href").replace("#","");
194-
var concept = $(this).text();
195-
$('.search-panel span#search_concept').text(concept);
196-
$('.input-group #search_param').val(param);
197-
document.getElementById("filter").value = concept;
225+
$('.search-panel .dropdown-menu').find('a').click(function(e) {
226+
e.preventDefault();
227+
var param = $(this).attr("href").replace("#","");
228+
var concept = $(this).text();
229+
$('.search-panel span#search_concept').text(concept);
230+
$('.input-group #search_param').val(param);
231+
document.getElementById("filter").value = concept;
232+
});
233+
234+
$('#nav').affix({
235+
offset: {
236+
top: $('header').height()
237+
}
238+
});
239+
198240
});
199-
});
200-
201-
<!--For older browsers -->
202-
function getElementByClassName(node, classname) {
203-
if (node.getElementByClassName) {
204-
//Use the existing method
205-
return node.getElementByClassName(classname);
206-
}
207-
else {
208-
var results = new Array();
209-
var elems = node.getElementsByTagName("*");
210-
for ( var i=0; i < elems.length; i++ ) {
211-
if (elems[i].classname.indexOf(classname) != -1) {
212-
results[results.length] = elems[i]
213-
}
214-
}
215-
}
216-
217-
}
218241

219242
</script>
220243
<script type="text/javascript" src="../static/recast.js"></script>
221244

222-
<br><br><br><br><br><br>
245+
<br><br><br><br><br><br><br><br><br><br><br>
223246
</body>
224247
</html>

0 commit comments

Comments
 (0)