Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
m3_webInterface
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
m3
m3_webInterface
Commits
9ebc6af2
Commit
9ebc6af2
authored
Jan 22, 2019
by
Mario Chirinos Colunga
💬
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
2c8f62c5
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
198 additions
and
21 deletions
+198
-21
updateDB.py
catalog/management/commands/updateDB.py
+1
-1
audioList.html
catalog/templates/new/audioList.html
+1
-1
header.html
catalog/templates/new/header.html
+23
-15
index-leftbar.html
catalog/templates/new/index-leftbar.html
+4
-4
newsDetails.html
catalog/templates/new/newsDetails.html
+9
-0
searches.html
catalog/templates/new/searches.html
+84
-0
settings_base.html
catalog/templates/new/settings_base.html
+27
-0
userProfile.html
catalog/templates/new/userProfile.html
+49
-0
No files found.
catalog/management/commands/updateDB.py
View file @
9ebc6af2
...
...
@@ -22,7 +22,7 @@ class Command(BaseCommand):
#update radio stations recotding time
print
(
"Recording Time:"
)
# recordingsDir = "/home/mario/virtualHDD/m3/recordings/"
recordingsDir
=
"/home/
mario/NASM3
/recordings/"
recordingsDir
=
"/home/
geoint/M3_NFS
/recordings/"
audioTime
.
objects
.
all
()
.
delete
()
publishers
=
Publisher
.
objects
.
all
()
.
filter
(
type
=
"audio"
)
...
...
catalog/templates/new/audioList.html
View file @
9ebc6af2
...
...
@@ -49,7 +49,7 @@
<tr
class=
"odd gradeX"
>
<td><a
href=
"{% url 'audio'%}{{p.publisher.shortName}}"
>
{{p.publisher.name}}
</a></td>
<td>
{{p.publisher.shortName}}
</td>
<td
><a
href=
"{{p.publisher.url}}"
target=
"blank"
>
{{p.publisher.url}}
</a></td>
<td
><a
class=
"CropLongTexts"
href=
"{{p.publisher.url}}"
target=
"blank"
>
{{p.publisher.url}}
</a></td>
<td>
{{p.startDate}}
</td>
<td>
{{p.minutes|div:60|floatformat:2 }}
</td>
...
...
catalog/templates/new/header.html
View file @
9ebc6af2
...
...
@@ -18,22 +18,30 @@
<div
class=
"navbar-custom-menu"
>
<ul
class=
"nav navbar-nav"
>
<!-- Control Sidebar Toggle Button -->
<li
class=
"dropdown
"
>
<a
class=
"dropdown-toggle"
data-toggle=
"dropdown"
href=
"#
"
>
<i
class=
"fa fa-user fa-fw"
></i>
<i
class=
"fa fa-caret-down"
></i>
<li
class=
"dropdown user user-menu
"
>
<a
class=
"dropdown-toggle"
data-toggle=
"dropdown"
href=
"#"
aria-expanded=
"false
"
>
<i
class=
"fa fa-user fa-fw"
></i>
<i
class=
"fa fa-caret-down"
></i>
</a>
<ul
class=
"dropdown-menu dropdown-user"
>
<li><a
href=
"{% url 'settings-profile' %}"
><i
class=
"fa fa-user fa-fw"
></i>
{{ user.get_username }}
</a>
</li>
<li><a
href=
"{% url 'settings' %}"
><i
class=
"fa fa-gear fa-fw"
></i>
Settings
</a>
</li>
<li
class=
"divider"
></li>
<li><a
href=
"{% url 'logout'%}?next={{request.path}}"
><i
class=
"fa fa-sign-out fa-fw"
></i>
Logout
</a>
</li>
</ul>
<!-- /.dropdown-user -->
</li>
<!-- /.dropdown -->
<ul
class=
"dropdown-menu"
>
<!-- User image -->
<li
class=
"user-header"
>
<i
class=
"fa fa-user fa-4x"
style=
"color:white"
></i>
<p>
{{user.username}}
</p>
</li>
<!-- Menu Body -->
<!-- Menu Footer-->
<li
class=
"user-footer"
>
<div
class=
"pull-left"
>
<a
href=
"{% url 'settings-profile' %}"
class=
"btn btn-default btn-flat"
>
Settings
</a>
</div>
<div
class=
"pull-right"
>
<a
href=
"{% url 'logout'%}?next={{request.path}}"
class=
"btn btn-default btn-flat"
>
Sign out
</a>
</div>
</li>
</ul>
</li>
</ul>
</div>
...
...
catalog/templates/new/index-leftbar.html
View file @
9ebc6af2
...
...
@@ -28,12 +28,12 @@
<ul
class=
"treeview-menu"
style=
"display: block;"
>
<form
role=
"form"
>
<li
class=
"
treeview menu-open
"
>
<a
href=
"{% url 'ws-download-news' %}?{{ request.GET.urlencode }}&format=JSON"
target=
"blank"
>
JSON
</a>
<li
class=
""
>
<a
href=
"{% url 'ws-download-news' %}?{{ request.GET.urlencode }}&format=JSON"
target=
"
_
blank"
>
JSON
</a>
</li>
<li
class=
"
treeview menu-open
"
>
<a
href=
"{% url 'ws-download-news' %}?{{ request.GET.urlencode }}&format=CSV"
target=
"blank"
>
CSV
</a>
<li
class=
""
>
<a
href=
"{% url 'ws-download-news' %}?{{ request.GET.urlencode }}&format=CSV"
target=
"
_
blank"
>
CSV
</a>
</li>
...
...
catalog/templates/new/newsDetails.html
View file @
9ebc6af2
...
...
@@ -9,6 +9,15 @@
{% endblock %}
{% block leftbar %}
<ul
class=
"sidebar-menu tree"
data-widget=
"tree"
>
<li
class=
"header"
>
Wordcloud
</li>
<li
class=
"treeview"
>
<a
href=
"#"
>
<span>
<img
src=
"{% url 'ws-wordcloud' newsId=news.id %}"
height=
"200px"
/></span>
</a>
</li>
</ul>
{% endblock %}
...
...
catalog/templates/new/searches.html
0 → 100644
View file @
9ebc6af2
{% extends "new/settings_base.html" %}
{% block headMedia %}
<link
rel=
"stylesheet"
type=
"text/css"
href=
"https://cdn.datatables.net/v/dt/dt-1.10.18/datatables.min.css"
/>
{% endblock %}
{% block dash-title %}
<b>
{{form.text.value|default:"Busquedas Realizadas"|capfirst}}
</b>
{% endblock %}
{% block dash %}
<!-- /.row -->
<div
class=
"row"
>
<div
class=
"col-lg-12"
>
<div
class=
"panel panel-default"
>
<div
class=
"panel-heading"
>
Busquedas
</div>
<!-- /.panel-heading -->
<div
class=
"panel-body"
>
<table
width=
"100%"
class=
"table table-striped table-bordered table-hover"
id=
"dataTables-search"
>
<thead>
<tr>
<th>
Texto
</th>
<th>
Inicio
</th>
<th>
Fin
</th>
<th>
Fuentes
</th>
</tr>
</thead>
<tfoot>
<tr>
<th>
Texto
</th>
<th>
Inicio
</th>
<th>
Fin
</th>
<th>
Fuentes
</th>
</tr>
</tfoot>
</table>
<!-- /.table-responsive -->
</div>
<!-- /.panel-body -->
</div>
<!-- /.panel -->
</div>
<!-- /.col-lg-12 -->
</div>
<!-- /.row -->
{% endblock %}
{% block scripts %}
<script
type=
"text/javascript"
src=
"https://cdn.datatables.net/v/dt/dt-1.10.18/datatables.min.js"
></script>
<script>
$
(
document
).
ready
(
function
()
{
$
(
'#dataTables-search'
).
DataTable
({
"order"
:
[[
2
,
"desc"
]],
"responsive"
:
true
,
"processing"
:
true
,
"serverSide"
:
true
,
"language"
:
{
"url"
:
"/static/languages/Spanish.json"
},
"ajax"
:
{
"url"
:
"/catalog/ws/searches/"
},
"data"
:{}
});
});
//console.log(" {{form.publishers.data|safe}} ");
</script>
{% endblock %}
catalog/templates/new/settings_base.html
0 → 100644
View file @
9ebc6af2
{% extends "new/adminLTE2_base.html" %}
{% block leftbar %}
<ul
class=
"sidebar-menu tree"
data-widget=
"tree"
>
<li>
<a
href=
"{% url 'settings-profile' %}"
><i
class=
"fa fa-user fa-fw"
></i><span>
Perfil
</span></a>
</li>
<li>
<a
href=
"{% url 'settings-password' %}"
><i
class=
"fa fa-lock fa-fw"
></i><span>
Contraseña
</span></a>
</li>
<li>
<a
href=
"{% url 'settings-subscriptions' %}"
><i
class=
"fa fa-rss fa-fw"
></i><span>
Subscripciones
</span></a>
</li>
<li>
<a
href=
"{% url 'settings-search' %}"
><i
class=
"fa fa-search fa-fw"
></i><span>
Busquedas
</span></a>
</li>
</ul>
{% endblock %}
{% block dash %}
{% endblock %}
catalog/templates/new/userProfile.html
0 → 100644
View file @
9ebc6af2
{% extends "new/settings_base.html" %}
{% load static %}
{% block headMedia %}
<script
type=
"text/javascript"
src=
"{% static 'static_jquery/js/jquery.js' %}"
></script>
<script
type=
"text/javascript"
src=
"{% static 'admin/js/jquery.init.js' %}"
></script>
{{ form.media }}
{% endblock %}
{% block dash-title %}
<b>
{{form.text.value|default:"Perfi de usuario"|capfirst}}
</b>
{% endblock %}
{% block dash %}
<div
class=
"row"
>
<div
class=
"col-md-12"
>
<div
class=
"box box-danger"
>
<div
class=
"box-header with-border"
>
<h3
class=
"box-title"
>
Subscripciones
</h3>
<div
class=
"box-tools pull-right"
>
<button
type=
"button"
class=
"btn btn-box-tool"
data-widget=
"collapse"
><i
class=
"fa fa-minus"
></i></button>
</div>
<!-- /.box-tools -->
</div>
<!-- /.box-header -->
<div
class=
"box-body"
>
<form
method=
"post"
>
{% csrf_token %}
<div>
{{ form }}
</div>
<div><button
type=
"submit"
>
Save changes
</button></div>
</form>
</div>
<!-- /.box-body -->
</div>
<!-- /.box -->
</div>
</div>
{% endblock %}
{% block scripts %}
<script>
</script>
{% endblock %}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment