Commit 3cd9487a05d77dd4ccf74c65d2ee7b9f83bb3c98

Authored by Miguel Barão
2 parents 12effd28 764f1085
Exists in master and in 1 other branch dev

Merge branch 'dev'

static/css/test.css
@@ -29,3 +29,6 @@ thead, tbody, td, th { @@ -29,3 +29,6 @@ thead, tbody, td, th {
29 padding: 5px; 29 padding: 5px;
30 border-bottom: 1px solid #ddd; 30 border-bottom: 1px solid #ddd;
31 } 31 }
  32 +.noleftmargin {
  33 + margin-left: 0px;
  34 +}
32 \ No newline at end of file 35 \ No newline at end of file
static/js/admin.js
@@ -97,7 +97,7 @@ $(document).ready(function() { @@ -97,7 +97,7 @@ $(document).ready(function() {
97 // ---------------------------------------------------------------------- 97 // ----------------------------------------------------------------------
98 function populateStudentsTable(students) { 98 function populateStudentsTable(students) {
99 var n = students.length; 99 var n = students.length;
100 - $("#students-header").html(n + " Alunos") 100 + $("#students-header").html(n + " Inscritos")
101 var rows = ""; 101 var rows = "";
102 $.each(students, function(i, d) { 102 $.each(students, function(i, d) {
103 var uid = d['uid']; 103 var uid = d['uid'];
templates/admin.html
@@ -11,6 +11,7 @@ @@ -11,6 +11,7 @@
11 <link rel="stylesheet" href="/static/bootstrap/css/bootstrap.min.css"> 11 <link rel="stylesheet" href="/static/bootstrap/css/bootstrap.min.css">
12 <link rel="stylesheet" href="/static/bootstrap/css/bootstrap-theme.min.css"> <!-- optional --> 12 <link rel="stylesheet" href="/static/bootstrap/css/bootstrap-theme.min.css"> <!-- optional -->
13 <link rel="stylesheet" href="/static/font-awesome/css/font-awesome.min.css"> 13 <link rel="stylesheet" href="/static/font-awesome/css/font-awesome.min.css">
  14 + <link rel="stylesheet" href="/static/css/test.css">
14 15
15 <script src="/static/js/jquery.min.js"></script> 16 <script src="/static/js/jquery.min.js"></script>
16 <script src="/static/bootstrap/js/bootstrap.min.js"></script> 17 <script src="/static/bootstrap/js/bootstrap.min.js"></script>
@@ -75,7 +76,7 @@ @@ -75,7 +76,7 @@
75 <!-- to be populated --> 76 <!-- to be populated -->
76 </div> 77 </div>
77 <div class="panel-body"> 78 <div class="panel-body">
78 - <table class="table table-condensed"> 79 + <table class="table table-condensed noleftmargin">
79 <thead> 80 <thead>
80 <tr> 81 <tr>
81 <th>Número</th> 82 <th>Número</th>
@@ -98,7 +99,7 @@ @@ -98,7 +99,7 @@
98 <!-- to be populated --> 99 <!-- to be populated -->
99 </div> 100 </div>
100 <div class="panel-body"> 101 <div class="panel-body">
101 - <table class="table table-condensed"> 102 + <table class="table table-condensed noleftmargin">
102 <thead> 103 <thead>
103 <tr> 104 <tr>
104 <th>Perm.</th> 105 <th>Perm.</th>
templates/grade.html
@@ -68,7 +68,7 @@ @@ -68,7 +68,7 @@
68 </div> 68 </div>
69 <div class="panel-body"> 69 <div class="panel-body">
70 70
71 - <table class="table table-condensed"> 71 + <table class="table table-condensed noleftmargin">
72 <thead> 72 <thead>
73 <tr> 73 <tr>
74 <th>Prova</th> 74 <th>Prova</th>