-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #11 from AthenaCES29/ftuyama_branch
Criação FrontEnd e BD das restrições de submissão
- Loading branch information
Showing
12 changed files
with
201 additions
and
100 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| # -*- coding: utf-8 -*- | ||
| # Generated by Django 1.9.4 on 2016-05-22 14:43 | ||
| from __future__ import unicode_literals | ||
|
|
||
| from django.db import migrations, models | ||
|
|
||
|
|
||
| class Migration(migrations.Migration): | ||
|
|
||
| dependencies = [ | ||
| ('Athena', '0003_auto_20160508_0121'), | ||
| ] | ||
|
|
||
| operations = [ | ||
| migrations.AddField( | ||
| model_name='atividade', | ||
| name='restricoes', | ||
| field=models.CharField(default=1, max_length=1000), | ||
| preserve_default=False, | ||
| ), | ||
| ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,108 +1,106 @@ | ||
| <!DOCTYPE html> | ||
| <html lang="en"> | ||
| <head> | ||
| <meta charset="UTF-8"> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1"> | ||
| <meta name="description" content=""> | ||
| <meta name="author" content=""> | ||
| <title>Athena | Professor</title> | ||
| <link rel="stylesheet" href="/static/css/bootstrap.min.css"> | ||
| <link rel="stylesheet" href="http://code.jquery.com/ui/1.11.0/themes/smoothness/jquery-ui.css"> | ||
| <script src="http://code.jquery.com/jquery-1.10.2.js"></script> | ||
| <script src="http://code.jquery.com/ui/1.11.4/jquery-ui.js"></script> | ||
| <script> | ||
| $(document).ready(function() { | ||
| $('input').filter('.date_picker').datepicker({dateFormat: 'yy-mm-dd'}); | ||
| }); | ||
| </script> | ||
| <script src="/static/js/bootstrap.min.js"></script> | ||
| <style type="text/css"> | ||
| * { | ||
| <head> | ||
| <meta charset="UTF-8"> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1"> | ||
| <meta name="description" content=""> | ||
| <meta name="author" content=""> | ||
| <title>Athena | Professor</title> | ||
| <link rel="stylesheet" href="/static/css/bootstrap.min.css"> | ||
| <link rel="stylesheet" href="http://code.jquery.com/ui/1.11.0/themes/smoothness/jquery-ui.css"> | ||
| <script src="http://code.jquery.com/jquery-1.10.2.js"></script> | ||
| <script src="http://code.jquery.com/ui/1.11.4/jquery-ui.js"></script> | ||
| <script> | ||
| $(document).ready(function() { | ||
| $('input').filter('.date_picker').datepicker({dateFormat: 'yy-mm-dd'}); | ||
| }); | ||
| </script> | ||
| <script src="/static/js/bootstrap.min.js"></script> | ||
| <style type="text/css"> | ||
| * { | ||
| margin: 0; | ||
| padding: 0; | ||
| } | ||
|
|
||
| .content { | ||
| } | ||
| .content { | ||
| padding-top: 20px; | ||
| } | ||
|
|
||
| .thumbnail_ws h3,p { | ||
| } | ||
| .thumbnail_ws h3,p { | ||
| text-align: center; | ||
| } | ||
|
|
||
| input { | ||
| } | ||
| input { | ||
| width: 100%; | ||
| } | ||
|
|
||
| textarea { | ||
| } | ||
| textarea { | ||
| width: 100%; | ||
| height: 5em; | ||
| resize: none; | ||
| } | ||
|
|
||
| #ano { | ||
| } | ||
| #ano { | ||
| width: 4em; | ||
| } | ||
| </style> | ||
| </head> | ||
|
|
||
| <body> | ||
| <div class="container-fluid"> | ||
| <div class="row"> | ||
| <div class="col-xs-6"> | ||
| <img src="/static/img/ita_logo.jpg" style="height: 50px;"> | ||
| </div> | ||
| <div class="col-xs-6" style="text-align: right;"> | ||
| <p style="line-height: 40px;"><a href="/logout/" class="btn btn-danger" role="button"><span class="glyphicon glyphicon-off"></span> Log Out</a></p> | ||
| </div> | ||
| </div> | ||
| <div class="row"> | ||
| <div class="col-xs-12"> | ||
| | ||
| </div> | ||
| </div> | ||
| <div class="row"> | ||
| <div class="col-xs-12"> | ||
| <div role="tabpanel"> | ||
| <!-- Nav tabs --> | ||
| <ul class="nav nav-tabs" role="tablist"> | ||
| <li role="presentation" class="active"> | ||
| <a href="#workspace" aria-controls="workspace" role="tab" data-toggle="tab"><span class="glyphicon glyphicon-home"></span> Workspace</a> | ||
| </li> | ||
| {% for turma in turmas %} | ||
| <li role="presentation"> | ||
| <a href=#{{turma.id}} aria-controls={{turma.id}} role="tab" data-toggle="tab">{{turma.nome}}</a> | ||
| </li> | ||
| {% endfor %} | ||
| </ul> | ||
| <!-- Tab panes --> | ||
| <div class="tab-content"> | ||
| <div role="tabpanel" class="tab-pane fade in active" id="workspace"> | ||
| <div class="row content"> | ||
| <div class="col-xs-12 col-md-3"> | ||
| <div class="thumbnail thumbnail_ws"> | ||
| <div class="caption"> | ||
| <p><h3>Abrir nova turma</h3></p> | ||
| <br> | ||
| <form method="post" enctype="multipart/form-data"> | ||
| <input type="hidden" name="post_turma" value="True"> | ||
| {% csrf_token %} | ||
| {{form}} | ||
| <p><button class="btn btn-lg btn-success btn-block" type="submit">Concluir</button></p> | ||
| </form> | ||
| </div> | ||
| } | ||
| </style> | ||
| </head> | ||
| <body> | ||
| <div class="container-fluid"> | ||
| <div class="row"> | ||
| <div class="col-xs-6"> | ||
| <img src="/static/img/ita_logo.jpg" style="height: 50px;"> | ||
| </div> | ||
| <div class="col-xs-6" style="text-align: right;"> | ||
| <p style="line-height: 40px;"><a href="/logout/" class="btn btn-danger" role="button"><span class="glyphicon glyphicon-off"></span> Log Out</a></p> | ||
| </div> | ||
| </div> | ||
| <div class="row"> | ||
| <div class="col-xs-12"> | ||
| | ||
| </div> | ||
| </div> | ||
| <div class="row"> | ||
| <div class="col-xs-12"> | ||
| <div role="tabpanel"> | ||
| <!-- Nav tabs --> | ||
| <ul class="nav nav-tabs" role="tablist"> | ||
| <li role="presentation" class="active"> | ||
| <a href="#workspace" aria-controls="workspace" role="tab" data-toggle="tab"><span class="glyphicon glyphicon-home"></span> Workspace</a> | ||
| </li> | ||
| {% for turma in turmas %} | ||
| <li role="presentation"> | ||
| <a href=#{{turma.id}} aria-controls={{turma.id}} role="tab" data-toggle="tab">{{turma.nome}}</a> | ||
| </li> | ||
| {% endfor %} | ||
| </ul> | ||
| <!-- Tab panes --> | ||
| <div class="tab-content"> | ||
| <div role="tabpanel" class="tab-pane fade in active" id="workspace"> | ||
| <div class="row content"> | ||
| <div class="col-xs-12 col-md-3"> | ||
| <div class="thumbnail thumbnail_ws"> | ||
| <div class="caption"> | ||
| <p> | ||
| <h3>Abrir nova turma</h3> | ||
| </p> | ||
| <br> | ||
| <form method="post" enctype="multipart/form-data"> | ||
| <input type="hidden" name="post_turma" value="True"> | ||
| {% csrf_token %} | ||
| {{form}} | ||
| <p><button class="btn btn-lg btn-success btn-block" type="submit">Concluir</button></p> | ||
| </form> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <!-- end of row --> | ||
| </div> | ||
| </div> <!-- end of row --> | ||
| </div> <!-- end of workspace tab --> | ||
| <!-- pane aqui --> | ||
| {% for pane in panes %} | ||
| {{pane |safe}} | ||
| {% endfor %} | ||
| <!-- end of workspace tab --> | ||
| <!-- pane aqui --> | ||
| {% for pane in panes %} | ||
| {{pane |safe}} | ||
| {% endfor %} | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </body> | ||
| </html> | ||
| </body> | ||
| </html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| 2 3 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| roteiro da atividade |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| 2 3 |
Oops, something went wrong.