Une MAJ de sécurité est nécessaire sur notre version actuelle. Elle sera effectuée lundi 02/08 entre 12h30 et 13h. L'interruption de service devrait durer quelques minutes (probablement moins de 5 minutes).

Commit 53182fc0 authored by Mathieu Giraud's avatar Mathieu Giraud
Browse files

Merge branch 'feature-sc/1156_css_columns' into 'dev'

css, replace similar rules for column width

See merge request !986
parents 5e2cfe0d 1bcc160b
Pipeline #270010 passed with stages
in 18 minutes and 59 seconds
......@@ -1300,16 +1300,7 @@ span.warningReads {
.db_table .column_50 {
width: 50px;
}
.db_table .column1 {
width: 100px;
}
.db_table .column2 {
width: 150px;
}
.db_table .column4 {
width: 50px;
}
.db_table .column5 {
.db_table .column_20 {
width: 20px;
}
.db_table .column_sep {
......
......@@ -1300,16 +1300,7 @@ span.warningReads {
.db_table .column_50 {
width: 50px;
}
.db_table .column1 {
width: 100px;
}
.db_table .column2 {
width: 150px;
}
.db_table .column4 {
width: 50px;
}
.db_table .column5 {
.db_table .column_20 {
width: 20px;
}
.db_table .column_sep {
......
......@@ -1483,21 +1483,8 @@ span.warningReads {
.db_table .column_150{ width: 150px; }
.db_table .column_100{ width: 100px; }
.db_table .column_50{ width: 50px; }
.db_table .column_20{ width: 20px; }
.db_table .column1{
width: 100px;
}
.db_table .column2{
width: 150px;
}
.db_table .column4{
width: 50px;
}
.db_table .column5{
width: 20px;
}
.db_table .column_sep {
width: 50px;
......
......@@ -11,16 +11,16 @@
<table class="db_table" id="table">
<thead>
<tr><td class="column_50"></td>
<td class="column2"> classification </td>
<td class="column2"> name </td>
<td class="column1"> program </td>
<td class="column_150"> classification </td>
<td class="column_150"> name </td>
<td class="column_100"> program </td>
<td> command </td>
<td class="column_100"> fuse </td>
<td> info </td>
<td class="column5"> </td>
<td class="column5"> </td>
<td class="column5"> </td>
<td class="column_20"> </td>
<td class="column_20"> </td>
<td class="column_20"> </td>
</tr>
</thead>
{{
......
......@@ -9,12 +9,12 @@
<div id="db_table_container">
<table class="db_table" id="table">
<thead>
<tr><td class="column1">id</td>
<tr><td class="column_100">id</td>
<td class="column_200"> group / user</td>
<td class="column_200">permissions</td>
<td class="column_200">access from</td>
<td> </td>
<td class="column1"> access</td>
<td class="column_100"> access</td>
</tr>
</thead>
{{admin = auth.can_modify_config(request.vars["id"])}}
......
......@@ -9,18 +9,18 @@
<table class="db_table" id="table">
<thead>
<tr>
<td class="column5">
<td class="column_20">
<input type="checkbox" id="group_check_all"
onclick="$('[name^=group_ids]').prop('checked', $(this).prop('checked'))" />
</td>
<td class="column1"> group name</td>
<td class="column2"> member</td>
<td class="column_100"> group name</td>
<td class="column_150"> member</td>
<td> info </td>
<td> parents </td>
<td class="column5"> </td>
<td class="column5"> </td>
<td class="column5"> </td>
<td class="column5"> </td>
<td class="column_20"> </td>
<td class="column_20"> </td>
<td class="column_20"> </td>
<td class="column_20"> </td>
</tr>
</thead>
{{for row in query :}}
......
......@@ -38,13 +38,13 @@
<div id="db_table_container">
<table class="db_table" id="table">
<thead>
<tr><td class="column1"> user name </td>
<tr><td class="column_100"> user name </td>
<td> email </td>
<td> last login </td>
<td class="column2"> - </td>
<td class="column_150"> - </td>
<td class="column_100"> sets created </td>
<td class="column_100"> files </td>
<td class="column5"> </td>
<td class="column_20"> </td>
</tr>
</thead>
<tbody>
......
......@@ -13,13 +13,13 @@
<table class="db_table" id="table">
<thead>
<tr>
<td class="column4"></td>
<td class="column_50"></td>
<td>name</td>
<td>filename</td>
<td>info</td>
<td class="column2">config</td>
<td class="column1">status</td>
<td class="column2">start time</td>
<td class="column_150">config</td>
<td class="column_100">status</td>
<td class="column_150">start time</td>
</tr>
</thead>
{{ for row in result: }}
......@@ -35,7 +35,7 @@
<td>{{=row.filename}}</td>
{{ info = tagdecorator.decorate(row.info, 'tag', 'sequence_file', '/my_account/jobs') }}
<td>{{=tagdecorator.sanitize(info)}}</td>
<td class="column2">
<td class="column_150">
{{ if row.status == 'COMPLETED':}}
<a href="/?sample_set_id={{=row.sample_set_id}}&config={{=row.config_id}}" onclick="event.preventDefault();event.stopPropagation();if( event.which == 2 ) { window.open(this.href); } else { myUrl.loadUrl(db, { 'sample_set_id' : {{=row.sample_set_id}}, 'config' : {{=row.config_id}} }, '{{=row.filename}}' ); }" >
{{=row.config}}
......@@ -44,8 +44,8 @@
{{=row.config}}
{{ pass }}
</td>
<td class="column1">{{=row.status}}</td>
<td class="column2">{{=row.time}}</td>
<td class="column_100">{{=row.status}}</td>
<td class="column_150">{{=row.time}}</td>
</tr>
{{pass}}
</table>
......
......@@ -25,8 +25,8 @@
<td class="column_50"> Type </td>
<td class="column_50"> Priority </td>
<td class="column_100"> Expiration Date </td>
<td class="column5"> </td>
<td class="column5"> </td>
<td class="column_20"> </td>
<td class="column_20"> </td>
{{pass}}
</tr>
</thead>
......
......@@ -9,13 +9,13 @@
<table class="db_table" id="table">
<thead>
<tr><td class="column_50"></td>
<td class="column2"> name </td>
<td class="column_150"> name </td>
<td> command </td>
<td> info </td>
<td class="column5"> </td>
<td class="column5"> </td>
<td class="column5"> </td>
<td class="column_20"> </td>
<td class="column_20"> </td>
<td class="column_20"> </td>
</tr>
</thead>
{{ for row in query :}}
......
......@@ -9,11 +9,11 @@
<div id="db_table_container">
<table class="db_table" id="table">
<thead>
<tr><td class="column1">id</td>
<tr><td class="column_100">id</td>
<td class="column_200"> group / user</td>
<td class="column_200">permissions</td>
<td class="column1">access from</td>
<td class="column1"> access</td>
<td class="column_100">access from</td>
<td class="column_100"> access</td>
</tr>
</thead>
{{admin = auth.can_modify_pre_process(request.vars["id"])}}
......
......@@ -16,21 +16,21 @@
<thead>
<tr>
<td class="column1" onclick="db.call('results_file/index', {'sort' :'filename', 'filter' : '{{=request.vars["filter"]}}'
<td class="column_100" onclick="db.call('results_file/index', {'sort' :'filename', 'filter' : '{{=request.vars["filter"]}}'
{{if not reverse and request.vars["sort"]=="filename" :}} , 'reverse' : true {{pass}} })">file_name</td>
<td class="column2" onclick="db.call('results_file/index', {'sort' :'config', 'filter' : '{{=request.vars["filter"]}}'
<td class="column_150" onclick="db.call('results_file/index', {'sort' :'config', 'filter' : '{{=request.vars["filter"]}}'
{{if not reverse and request.vars["sort"]=="config" :}} , 'reverse' : true {{pass}} })">config</td>
<td> </td>
<td class="column1" onclick="db.call('results_file/index', {'sort' :'patient', 'filter' : '{{=request.vars["filter"]}}'
<td class="column_100" onclick="db.call('results_file/index', {'sort' :'patient', 'filter' : '{{=request.vars["filter"]}}'
{{if not reverse and request.vars["sort"]=="patient" :}} , 'reverse' : true {{pass}} })">patient</td>
<td class="column2" onclick="db.call('results_file/index', {'sort' :'producer', 'filter' : '{{=request.vars["filter"]}}'
<td class="column_150" onclick="db.call('results_file/index', {'sort' :'producer', 'filter' : '{{=request.vars["filter"]}}'
{{if not reverse and request.vars["sort"]=="producer" :}} , 'reverse' : true {{pass}} })">producer</td>
<td class="column2" onclick="db.call('results_file/index', {'sort' :'run_date', 'filter' : '{{=request.vars["filter"]}}'
<td class="column_150" onclick="db.call('results_file/index', {'sort' :'run_date', 'filter' : '{{=request.vars["filter"]}}'
{{if not reverse and request.vars["sort"]=="run_date" :}} , 'reverse' : true {{pass}} })">last process</td>
<td class="column2" onclick="db.call('results_file/index', {'sort' :'status', 'filter' : '{{=request.vars["filter"]}}'
<td class="column_150" onclick="db.call('results_file/index', {'sort' :'status', 'filter' : '{{=request.vars["filter"]}}'
{{if not reverse and request.vars["sort"]=="status" :}} , 'reverse' : true {{pass}} })">status</td>
<td class="column5"></td>
<td class="column4"></td>
<td class="column_20"></td>
<td class="column_50"></td>
</tr>
</thead>
......
......@@ -9,8 +9,8 @@
<table class="db_table" id="table">
<thead>
<tr>
<td class="column1">file</td>
<td class="column4">size</td>
<td class="column_100">file</td>
<td class="column_50">size</td>
</tr>
</thead>
{{for file in files :}}
......
......@@ -18,7 +18,7 @@
<table class="db_table" id="table">
<thead>
<tr>
<td class="column4"></td>
<td class="column_50"></td>
{{ for header in fields: }}
{{if isAdmin or header['public']:}}
<td class="{{if header['width']:}}column_{{=header['width']}}{{pass}} pointer"
......@@ -29,9 +29,9 @@
{{ pass }}
{{ pass }}
<td class="column5"> </td>
<td class="column5"> </td>
<td class="column5"> </td>
<td class="column_20"> </td>
<td class="column_20"> </td>
<td class="column_20"> </td>
</tr>
</thead>
......
......@@ -56,7 +56,7 @@
<div id="db_table_container">
<table class="db_table table_compare" id="table">
<thead>
<tr><td class="column5"> </td>
<tr><td class="column_20"> </td>
<td class="column_200"> {{=helper.get_type_display() if helper is not None else "name"}} </td>
<td class="column_200"> file name </td>
<td class="column_100"> sampling date </td>
......@@ -67,7 +67,7 @@
<td class="column_100"> config </td>
<td class="column_sep"></td>
<td class="column2">last processing</td>
<td class="column_150">last processing</td>
</tr>
</thead>
<tbody>
......
......@@ -55,19 +55,19 @@
{{pass}}
<td> pre-process </td>
{{if auth.is_admin():}} <td> uploader </td> {{pass}}
<td class="column5"> </td>
<td class="column5"> </td>
<td class="column5"> </td>
<td class="column_20"> </td>
<td class="column_20"> </td>
<td class="column_20"> </td>
<td class="column_sep"></td>
<td class="column2">last processing</td>
<td class="column_150">last processing</td>
<td class="column_100">status</td>
<td class="column5"></td>
<td class="column5"></td>
<td class="column5"></td>
<td class="column5"></td>
<td class="column5"></td>
<td class="column_20"></td>
<td class="column_20"></td>
<td class="column_20"></td>
<td class="column_20"></td>
<td class="column_20"></td>
</tr>
</thead>
......
......@@ -12,7 +12,7 @@
<span class="content {{=h}}">{{=h}}</span>
</td>
{{ pass }}
<td class="column5 devel-mode"></td>
<td class="column_20 devel-mode"></td>
</tr>
</thead>
<tbody>
......
......@@ -7,12 +7,12 @@
<div id="db_table_container">
<table class="db_table" id="table">
<thead>
<tr><td class="column1"></td>
<tr><td class="column_100"></td>
<td class="column_200"> group / user</td>
<td class="column_200">permissions</td>
<td class="column_200">access from</td>
<td> </td>
<td class="column1"> read</td>
<td class="column_100"> read</td>
</tr>
</thead>
{{admin = auth.can_modify_sample_set(request.vars["id"])}}
......
......@@ -43,7 +43,7 @@
<table class="db_table" id="table" border="1">
<thead>
<tr>
<td class="column4"> </td>
<td class="column_50"> </td>
{{ for header in fields: }}
{{if isAdmin or header['public']:}}
<td class="{{if header['width']:}}column_{{=header['width']}}{{pass}} pointer"
......@@ -58,7 +58,7 @@
<tbody>
{{for row in query :}}
<tr>
<td class="column4">
<td class="column_50">
<input type="checkbox"
name="sample_set_ids[]"
value="{{=row['sample_set_id']}}"
......
......@@ -18,7 +18,7 @@
{{if not reverse and request.vars["sort"]=="patients" :}} , 'reverse' : true {{pass}} })">patients created </td>
<td class="column_100" onclick="db.call('user/index', {'sort' :'files'
{{if not reverse and request.vars["sort"]=="files" :}} , 'reverse' : true {{pass}} })">files uploaded </td>
<td class="column5"> </td>
<td class="column_20"> </td>
</tr>
</thead>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment