Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
PGPI-entrega
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Automate
Agent sessions
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
sergest
PGPI-entrega
Commits
618b52bc
Commit
618b52bc
authored
Jan 5, 2019
by
Nacho
Browse files
Options
Downloads
Patches
Plain Diff
botones laterales
parent
8b68915f
No related branches found
No related tags found
1 merge request
!36
botones laterales
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/templates/add_comentario.html
+13
-26
13 additions, 26 deletions
src/templates/add_comentario.html
src/templates/add_tiempo.html
+13
-27
13 additions, 27 deletions
src/templates/add_tiempo.html
with
26 additions
and
53 deletions
src/templates/add_comentario.html
+
13
−
26
View file @
618b52bc
...
...
@@ -15,6 +15,7 @@
<link
rel=
"stylesheet"
href=
"https://use.fontawesome.com/releases/v5.6.1/css/all.css"
integrity=
"sha384-gfdkjb5BdAXd+lj+gudLWI+BXq4IuLW5IT+brZEZsLFm++aCMlF1V92rMkPaX4PP"
crossorigin=
"anonymous"
>
<link
rel=
"stylesheet"
type=
"text/css"
href=
"../static/css/formulario.css"
>
<script
src=
"{{ url_for('static', filename='scripts/includeHTML.js') }}"
></script>
</head>
<body
class=
"d-flex"
style=
"min-height: 100%;min-width: 100%;"
>
...
...
@@ -25,36 +26,19 @@
</div>
</nav>
<div
id=
"side-nav"
class=
"side-nav fixed-top flex-nowrap flex-column justify-content-start d-inline-flex align-items-start bg-light"
onmouseover=
"openSide('side-nav')"
>
<div
id=
"side-nav"
class=
"side-nav fixed-top flex-nowrap flex-column justify-content-start d-inline-flex align-items-start bg-light"
onmouseover=
"openSide('side-nav')"
>
<div
class=
"side-title side-content d-flex "
>
<img
id=
"user-img"
class=
"user-icon"
src=
"../static/img/default-gravatar.png"
alt=
"user icon"
>
<span
class=
"collapse width align-self-center"
style=
"min-width: 70%;padding-left: 5%
"
>
User Name
</span>
<span
class=
"collapse width align-self-center"
style=
"min-width: 70%;padding-left: 5%
;max-height: 10%"
>
{{ current_user.nick }}
</span>
</div>
<div
class=
"list-group list-group-flush w-100 side-icons"
>
<a
class=
"list-group-item d-flex justify-content-start align-items-center bg-light"
>
<span
class=
"material-icons"
style=
"color: black;"
>
person_add
</span>
<span
class=
"collapse width align-top side-options"
>
Add User
</span>
</a>
<a
class=
"list-group-item d-flex justify-content-start align-items-center bg-light"
>
<span
class=
"fa fa-plus-square fa-m"
style=
"color: black;"
></span>
<span
class=
"collapse width align-top side-options"
>
Item
</span>
</a>
</a>
<a
class=
"list-group-item d-flex justify-content-start align-items-center bg-light"
href=
"/registrar_nueva_incidencia"
>
<span
class=
"fas fa-project-diagram fa-m "
style=
"color: gray;"
></span>
<span
class=
"collapse width align-top side-options"
>
Registrar nueva incidencia
</span>
</a>
<a
class=
"list-group-item d-flex justify-content-start align-items-center bg-light"
>
<span
class=
"fas fa-code fa-m "
style=
"color: green;"
></span>
<span
class=
"collapse width align-top side-options"
>
Ver estadisticas
</span>
</a>
<a
class=
"list-group-item d-flex justify-content-start align-items-center bg-light"
>
<span
class=
"fas fa-code fa-m "
style=
"color: grey;"
></span>
<span
class=
"collapse width align-top side-options"
>
Filtros de incidencias
</span>
</a>
</div>
{% if current_user.tipo == 0 %}
<div
w3-include-html=
"{{ url_for('static', filename='menus/menu_supervisor.html') }}"
></div>
{% elif current_user.tipo == 1 %}
<div
w3-include-html=
"{{ url_for('static', filename='menus/menu_tecnico.html') }}"
></div>
{% elif current_user.tipo == 2 %}
<div
w3-include-html=
"{{ url_for('static', filename='menus/menu_cliente.html') }}"
></div>
{% endif %}
</div>
<div
id=
"data-body"
class=
"container-fluid flex-grow-1"
onmouseover=
"closeSide('side-nav')"
>
...
...
@@ -102,6 +86,9 @@
crossorigin=
"anonymous"
></script>
<script
src=
"https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js"
integrity=
"sha384-ChfqqxuZUCnJSK3+MXmPNIyE6ZbWh2IMqE241rYiqJxyMiZ6OW/JmZQ5stwEULTy"
crossorigin=
"anonymous"
></script>
<script>
includeHTML
();
</script>
</body>
...
...
This diff is collapsed.
Click to expand it.
src/templates/add_tiempo.html
+
13
−
27
View file @
618b52bc
...
...
@@ -15,6 +15,7 @@
<link
rel=
"stylesheet"
href=
"https://use.fontawesome.com/releases/v5.6.1/css/all.css"
integrity=
"sha384-gfdkjb5BdAXd+lj+gudLWI+BXq4IuLW5IT+brZEZsLFm++aCMlF1V92rMkPaX4PP"
crossorigin=
"anonymous"
>
<link
rel=
"stylesheet"
type=
"text/css"
href=
"../static/css/formulario.css"
>
<script
src=
"{{ url_for('static', filename='scripts/includeHTML.js') }}"
></script>
</head>
<body
class=
"d-flex"
style=
"min-height: 100%;min-width: 100%;"
>
...
...
@@ -25,36 +26,19 @@
</div>
</nav>
<div
id=
"side-nav"
class=
"side-nav fixed-top flex-nowrap flex-column justify-content-start d-inline-flex align-items-start bg-light"
onmouseover=
"openSide('side-nav')"
>
<div
id=
"side-nav"
class=
"side-nav fixed-top flex-nowrap flex-column justify-content-start d-inline-flex align-items-start bg-light"
onmouseover=
"openSide('side-nav')"
>
<div
class=
"side-title side-content d-flex "
>
<img
id=
"user-img"
class=
"user-icon"
src=
"../static/img/default-gravatar.png"
alt=
"user icon"
>
<span
class=
"collapse width align-self-center"
style=
"min-width: 70%;padding-left: 5%
"
>
User Name
</span>
<span
class=
"collapse width align-self-center"
style=
"min-width: 70%;padding-left: 5%
;max-height: 10%"
>
{{ current_user.nick }}
</span>
</div>
<div
class=
"list-group list-group-flush w-100 side-icons"
>
<a
class=
"list-group-item d-flex justify-content-start align-items-center bg-light"
>
<span
class=
"material-icons"
style=
"color: black;"
>
person_add
</span>
<span
class=
"collapse width align-top side-options"
>
Add User
</span>
</a>
<a
class=
"list-group-item d-flex justify-content-start align-items-center bg-light"
>
<span
class=
"fa fa-plus-square fa-m"
style=
"color: black;"
></span>
<span
class=
"collapse width align-top side-options"
>
Item
</span>
</a>
</a>
<a
class=
"list-group-item d-flex justify-content-start align-items-center bg-light"
href=
"/registrar_nueva_incidencia"
>
<span
class=
"fas fa-project-diagram fa-m "
style=
"color: gray;"
></span>
<span
class=
"collapse width align-top side-options"
>
Registrar nueva incidencia
</span>
</a>
<a
class=
"list-group-item d-flex justify-content-start align-items-center bg-light"
>
<span
class=
"fas fa-code fa-m "
style=
"color: green;"
></span>
<span
class=
"collapse width align-top side-options"
>
Ver estadisticas
</span>
</a>
<a
class=
"list-group-item d-flex justify-content-start align-items-center bg-light"
>
<span
class=
"fas fa-code fa-m "
style=
"color: grey;"
></span>
<span
class=
"collapse width align-top side-options"
>
Filtros de incidencias
</span>
</a>
</div>
{% if current_user.tipo == 0 %}
<div
w3-include-html=
"{{ url_for('static', filename='menus/menu_supervisor.html') }}"
></div>
{% elif current_user.tipo == 1 %}
<div
w3-include-html=
"{{ url_for('static', filename='menus/menu_tecnico.html') }}"
></div>
{% elif current_user.tipo == 2 %}
<div
w3-include-html=
"{{ url_for('static', filename='menus/menu_cliente.html') }}"
></div>
{% endif %}
</div>
<div
id=
"data-body"
class=
"container-fluid flex-grow-1"
onmouseover=
"closeSide('side-nav')"
>
...
...
@@ -104,7 +88,9 @@
crossorigin=
"anonymous"
></script>
<script
src=
"https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js"
integrity=
"sha384-ChfqqxuZUCnJSK3+MXmPNIyE6ZbWh2IMqE241rYiqJxyMiZ6OW/JmZQ5stwEULTy"
crossorigin=
"anonymous"
></script>
<script>
includeHTML
();
</script>
</body>
</html>
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
sign in
to comment