Commit ea31cbff authored by João Denis Rodrigues's avatar João Denis Rodrigues
Browse files

url + algumas views + alguns templates

parent 7af12cdf
......@@ -38,11 +38,13 @@ INSTALLED_APPS = [
'django.contrib.messages',
'django.contrib.staticfiles',
'admission.apps.AdmissionConfig',
'adega',
'course.apps.CourseConfig',
'degree.apps.DegreeConfig',
'klass.apps.KlassConfig',
'student.apps.StudentConfig',
'teacher.apps.TeacherConfig',
'public.apps.PublicConfig',
]
MIDDLEWARE = [
......
$(document).ready(function () {
setup_change_course();
setup_datatables();
});
......@@ -15,15 +14,4 @@ function setup_datatables(){
"info": false
});
}
}
function setup_change_course() {
$change_course = $('#change_course')
$change_course
.children('select')
.change(function () {
$change_course.submit()
})
}
\ No newline at end of file
html {
min-height: 100%;
position: relative;
......@@ -12,11 +14,13 @@ body {
right: 0;
padding-bottom: 170px;
padding-top: 70px;
padding-top: 60px;
}
#wrap-page {
min-height: 95%;
margin: 0;
padding: 0;
}
/* ============================================ TOP */
......@@ -33,18 +37,19 @@ h1#title {
font-size: 44px;
}
/* ============================================ NAVBAR */
select#change_course {
margin-top: 8px;
.navbar-text {
color: #afb0c5 !important;
}
/* ============================================ MESSAGES */
/* ============================================ CONTENT */
#content {
min-height: 100px;
padding: 2em 2em;
}
/* ============================================ FOOTER */
......@@ -53,104 +58,102 @@ select#change_course {
background-color: #263646;
border-top: 4px solid #31c2e4;
margin-top: 40px;
padding-bottom: 30px;
padding-top: 20px;
padding-bottom: 80px;
color: #FFF;
}
#footer ul {
font-size: 0;
}
#footer li {
font-size: 16px;
}
#footer a {
color: #FFF;
font-size: 1.1em;
}
#footer a:hover {
color: #18BC9C;
}
#footer div.person {
padding: 15px 5px 14px 62px;
background-color: #EEE;
border: 1px solid #777;
border-radius: 8px;
box-shadow: 1px 2px 5px #9B9B9B;
font-size: larger;
font-weight: bolder;
z-index: 80;
position: relative;
top: 0;
left: 0;
#footer h3 {
padding-bottom: 4px;
border-bottom: 2px solid #FFF;
}
#footer div.person a {
color: #333;
}
#footer div.person img {
width: 60px;
height: 60px;
/* ============================================= REPORTS */
position: absolute;
top: -3px;
left: -4px;
background-color: white;
border: 1px solid #555;
border-radius: 30px;
/* box-shadow: 1px 1px 3px #888; */
}
#footer div.plus {
font-size: x-large;
font-weight: light;
.sidebar{
transition: all 0.5s ease-in-out;
padding: 0;
height: 100%;
background-color: #2f4861;
}
padding: 4px 8px;
.sidebar ul{ list-style:none; margin:0px; padding:0px; }
background-color: #C8C8C8;
border: 1px solid #777;
.sidebar li,
.sidebar li div {
display: flex;
}
height: 40px;
width: 40px;
border-radius: 20px;
box-shadow: 1px 1px 2px #888;
z-index: 100;
position: relative;
left: calc(50% - 25px);
margin-top: -10px;
margin-bottom: -10px;
.sidebar li a {
flex-grow: 1;
}
/* ============================================= REPORTS */
#sidebar {
background-color: #eee;
.sidebar .drop {
display: inline-block;
padding: 14px 18px;
flex-grow: 0;
}
.sidebar li a,
.sidebar li a.collapsed.active{
padding: 14px 0px 14px 20px;
color: #d3d5d8;
border-left: 0px solid #159e83;
text-decoration: none
}
.sidebar li li a {
padding: 8px auto;
}
.sidebar li a.active{background-color:#2c3e50;border-left:5px solid #159e83; transition: all 0.5s ease-in-out}
.sidebar li a:hover{color:#FFF !important; background-color: #132940}
.sidebar li a i{ padding-right:5px;}
.sidebar ul li .sub-menu li a{ position:relative}
.sidebar ul li .sub-menu li a:hover:after {
content: "";
position: absolute;
left: -5px;
top: 0;
width: 5px;
background-color: #111;
height: 100%;
}
.sidebar ul li .sub-menu li a:hover{ background-color:#222; padding-left:20px; transition: all 0.5s ease-in-out}
.sub-menu{ border-left:5px solid #4a7d73;}
.sidebar li a .nav-label,.sidebar li a .nav-label+span{ transition: all 0.5s ease-in-out}
#sidebar ul {
list-style: none;
}
#sidebar ul a {
display: inline-block;
line-height: 48px;
font-size: large;
.sidebar.fliph li a .nav-label,.sidebar.fliph li a .nav-label+span{ display:none;transition: all 0.5s ease-in-out}
.sidebar.fliph {
width: 42px;transition: all 0.5s ease-in-out;
}
img.report-chart {
width: 90%;
margin: auto;
.sidebar.fliph li{ position:relative}
.sidebar.fliph .sub-menu {
position: absolute;
left: 39px;
top: 0;
background-color: #222;
width: 150px;
z-index: 100;
}
/* ========================== DEFINICOES ESPECIAIS DE CADA AREA */
......@@ -173,17 +176,12 @@ img.report-chart {
flex: 1;
box-shadow: 0 0 1px #DDD;
h3 {
margin-top: 0.1em;
}
span.data {
margin: 0 1.5em;
}
}
.panel-line {
display: flex;
}
......@@ -193,242 +191,4 @@ span.data {
font-size: 1em;
border-bottom: 1px solid #3c3c3c;
box-shadow: none;
h3 {
font-size: 14px;
}
}
/* ===================================== PLUGIN UPLOAD FILE */
/*!
* @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2015
* @package bootstrap-fileinput
* @version 4.1.8
*
* File input styling for Bootstrap 3.0
* Built for Yii Framework 2.0
* Author: Kartik Visweswaran
* Year: 2015
* For more Yii related demos visit http://demos.krajee.com
*/
.file-input {
overflow-x: auto
}
.file-loading {
top: 0;
right: 0;
width: 25px;
height: 25px;
font-size: 999px;
text-align: right;
color: #fff;
background: transparent url(../img/loading.gif) top left no-repeat;
border: none
}
.btn-file {
position: relative;
overflow: hidden
}
.btn-file input[type=file] {
position: absolute;
top: 0;
right: 0;
min-width: 100%;
min-height: 100%;
text-align: right;
filter: alpha(opacity=0);
opacity: 0;
background: none repeat scroll 0 0 transparent;
cursor: inherit;
display: block
}
.file-caption .glyphicon {
display: inline-block;
min-width: 18px;
float: left;
margin-top: 2px
}
.file-caption-name {
display: inline-block;
overflow: hidden;
max-height: 20px;
padding-right: 10px;
word-break: break-all
}
.file-caption-ellipsis {
position: absolute;
right: 10px;
margin-top: -6px;
font-size: 1.2em;
display: none;
font-weight: 700;
cursor: default
}
.kv-has-ellipsis .file-caption-ellipsis {
display: inline
}
.kv-has-ellipsis {
padding-right: 17px
}
.kv-search-container .kv-search-clear {
position: absolute;
padding: 10px;
right: 0
}
.file-error-message {
background-color: #f2dede;
color: #a94442;
text-align: center;
border-radius: 5px;
padding: 5px
}
.file-error-message pre, .file-error-message ul {
text-align: left;
margin: 5px 0
}
.file-caption-disabled {
background-color: #EEE;
cursor: not-allowed;
opacity: 1
}
.file-input .btn .disabled, .file-input .btn[disabled] {
cursor: not-allowed
}
.file-preview {
border-radius: 5px;
border: 1px solid #ddd;
padding: 5px;
width: 100%;
margin-bottom: 5px
}
.file-preview-frame {
display: table;
margin: 8px;
height: 160px;
border: 1px solid #ddd;
box-shadow: 1px 1px 5px 0 #a2958a;
padding: 6px;
float: left;
text-align: center;
vertical-align: middle
}
.file-preview-frame:hover {
box-shadow: 3px 3px 5px 0 #333
}
.file-preview-image {
height: 160px;
vertical-align: text-center
}
.file-preview-text {
width: 160px;
color: #428bca;
font-size: 11px;
text-align: center
}
.file-preview-other {
padding-top: 48px;
text-align: center
}
.file-preview-other i {
font-size: 2.4em
}
.file-other-error {
width: 100%;
padding-top: 30px;
text-align: right
}
.file-input-ajax-new .fileinput-remove-button, .file-input-ajax-new .fileinput-upload-button, .file-input-new .close, .file-input-new .file-preview, .file-input-new .fileinput-remove-button, .file-input-new .fileinput-upload-button, .file-input-new .glyphicon-file {
display: none
}
.loading {
background: transparent url(../img/loading.gif) no-repeat scroll center center content-box !important
}
.wrap-indicator {
font-weight: 700;
color: #245269;
cursor: pointer
}
.file-actions {
text-align: left
}
.file-footer-buttons {
float: right
}
.file-thumbnail-footer .file-caption-name {
padding-top: 4px;
font-size: 11px;
color: #777
}
.file-upload-indicator {
padding-top: 2px;
cursor: default
}
.file-upload-indicator:hover {
font-size: 1.2em;
font-weight: 700;
padding-top: 0
}
.file-drop-zone {
border: 1px dashed #aaa;
border-radius: 4px;
height: 100%;
text-align: center;
vertical-align: middle;
margin: 12px 15px 12px 12px;
padding: 5px
}
.file-drop-zone-title {
color: #aaa;
font-size: 40px;
padding: 85px 10px
}
.highlighted {
border: 2px dashed #999 !important;
background-color: #f0f0f0
}
.file-uploading {
background-image: url(../img/loading-sm.gif);
background-position: center bottom 10px;
background-repeat: no-repeat;
opacity: .6
}
.file-icon-large {
font-size: 1.2em
}
}
\ No newline at end of file
This diff is collapsed.
......@@ -97,6 +97,9 @@ function chartConfig(type, data, scales, fill_line) {
tooltips: {
mode: 'label',
},
/*tooltips: {
mode: 'label',
},*/
elements: {
line: {
fill: fill_line,
......@@ -153,7 +156,7 @@ function calculate_max(values, error=false) {
return max;
}
function setDataset(type, textLabel, color) {
function new_setDataset(type, textLabel, color) {
var dataset = {
type: type,
label: textLabel,
......@@ -211,7 +214,7 @@ function define_datasets(data, type, label, chosen_colors, error=false) {
};
if (error) {
for (i = 0, j = 0; i < data.values.length; i += 2, j++) {
obj.datasets.push(setDataset(type[i], label[j], chosen_colors[i]));
obj.datasets.push(new_setDataset(type[i], label[j], chosen_colors[i]));
obj.datasets[j].data = data.values[i];
obj.datasets[j].error = data.values[i+1];
obj.datasets[j].errorColor = colors[chosen_colors[i+1]].border;
......@@ -219,7 +222,7 @@ function define_datasets(data, type, label, chosen_colors, error=false) {
}
else {
for (d in data.values) {
obj.datasets.push(setDataset(type[d], label[d], chosen_colors[d]));
obj.datasets.push(new_setDataset(type[d], label[d], chosen_colors[d]));
obj.datasets[d].data = data.values[d];
}
}
......@@ -262,6 +265,10 @@ function personalized_config(options, config) {
config.options.elements.line.fill = options['fill'];
break;
case 'stacked':
/*yAxes = config.options.scales.yAxes
for (y in yAxes) {
yAxes[y].stacked = options['stacked'];
}*/
nok = Object.keys(options[object_key[key]]);
stacked = options['stacked'];
for (nk in nok) {
......
This diff is collapsed.
{% load static %}
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<title>{{ title|default:"Adega - PET Computação UFPR" }}</title>
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<link rel="stylesheet" href="{% static 'flatly_theme/bootstrap.css' %}">
<link rel="stylesheet" href="{% static 'adega/style.css' %}">
{% block extra_css %}{% endblock extra_css %}
</head>
<body>
<div id="wrap-page" class="container-fluid row">
{% include 'adega/navbar.html' %}
{% include 'adega/sidebar.html' %}
<div id="content" class="col-md-10">
{% if messages %}
<ul id="messages" class="list-unstyled">
{% for message in messages %}
<li class="alert{% if message.tags %} alert-{{ message.tags }}{% endif %}" role="alert">{{ message }}</li>
{% endfor %}
</ul>
{% endif %}
{% block content %}{% endblock content %}
</div>
</div>
<div id="footer" class="col-md-12 col-xs-12">
<div class="container container-fluid">
<div class="col-md-4">
<h3>Links</h3>
<ul>
<li><a href="http://pet.inf.ufpr.br/projetos/adega.html">Página oficial do projeto</a></li>
<li><a href="http://gitlab.c3sl.ufpr.br/pet/adega">Código fonte</a></li>
<li><a href="{% url 'developers' %}">Desenvolvedores</a></li>
</ul>
</div>
<div class="col-md-4 col-md-offset-4">
<h3>Mantido por</h3>
<a href="http://pet.inf.ufpr.br">
<img src="{% static 'pet/logo_preto.png' %}" width="50%" height="50%">
</a>
</div>
</div>
</div>
<script src="{% static 'jquery-2.2.4/jquery.min.js' %}"></script>
<script src="{% static 'bootstrap-3.3.7/js/bootstrap.min.js' %}"></script>
<script src="{% static 'adega/script.js' %}"></script>
{% block extra_js %}{% endblock extra_js %}