diff --git a/LICENCE b/LICENCE index cc662cd..b28c0ba 100644 --- a/LICENCE +++ b/LICENCE @@ -7,9 +7,12 @@ http://creativecommons.org/licenses/by/3.0/br/deed.en_US This work uses code from: +Rserve rserve-php - php interface to R by Clément Turbelin, Simon Urbanek jQuery jQuery datepicker extension by Trent Richardson +jQuery latex by Andreas Grech +Bootstrap This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/README.md b/README.md index 44964fd..74e8bee 100644 --- a/README.md +++ b/README.md @@ -23,3 +23,12 @@ Para instalar uma nova plataforma notaR, siga os passos descritos na wiki acima. *NOTE* que a versão atual no Github é uma versão de desenvolvimento (ou seja, warnings e erros são mostrados sem filtros ao usuário), enquanto versões na página de [Releases] (https://github.com/lageIBUSP/notaR/releases) são adequadas para produção. + +**Importante:** se você está fazendo clone a partir do Github, lembre-se de executar os seguintes comandos de dentro +do diretório clonado: +``` +git submodule init +git submodule update +``` + + diff --git a/html/aluno.php b/html/aluno.php index e96a52b..e8b01e0 100644 --- a/html/aluno.php +++ b/html/aluno.php @@ -1,10 +1,11 @@ admin()) { - echo "Acesso negado"; + echo "

Acesso negado

"; exit; } +require('menu.php'); if(! isset($_REQUEST['id'])) { - echo "

Erro interno!

"; + echo "

Erro interno!

"; exit; } $aluno = new Aluno($_REQUEST['id']); @@ -20,7 +21,7 @@
Turma:
+/> Admin
diff --git a/html/alunos.php b/html/alunos.php index 4162ecb..8974e3b 100644 --- a/html/alunos.php +++ b/html/alunos.php @@ -1,9 +1,10 @@ admin()) { - echo "Acesso negado"; + echo "

Acesso negado

"; exit; } +require('menu.php'); ###### Codigo aqui if(isset($_POST['submit']) AND $_POST['submit']=="altera") { @@ -14,35 +15,40 @@ if(isset($_POST['submit']) AND $_POST['submit']=="insere") { $arr=preg_split("/\r\n|\r|\n/",$_POST['novos']); $senha = $_POST['senha']; - if (empty($senha)) { echo "

Você deve informar uma senha!

";} + if (empty($senha)) { echo "

Você deve informar uma senha!

";} else { foreach ($arr as $novo) { $aluno = new Aluno(); - echo $aluno->create($novo, $TURMA, $senha)."
"; + echo $aluno->create(trim($novo), $TURMA, $senha)."
"; } } } ?>

Cadastro de alunos

-

Escolha a turma

- +
+ +
-

Alunos cadastrados:

- +
+ +
AdminLoginNotasEditar
"; + echo ""; } ?> -
AdminLoginNotasEditar "; - if ($aluno->admin()) echo ""; else echo " "; - echo "".$aluno->getNome()."".$aluno->numNotas().""; - echo "
"; + if ($aluno->admin()) echo ""; else echo " "; + echo "".$aluno->getNome()."".$aluno->numNotas().""; + echo "
+ +

Para cadastrar novos alunos nesta turma, preencha os logins na caixa de texto abaixo, um por linha:

- -

Senha: + +

+ + +

diff --git a/html/arquivos.php b/html/arquivos.php new file mode 100644 index 0000000..373620a --- /dev/null +++ b/html/arquivos.php @@ -0,0 +1,69 @@ +admin()) { + echo "

Acesso negado

"; + exit; +} +require('menu.php'); +?> +

Administração de arquivos de dados

+O arquivo parece estar em uso por um ou mais exercícios!

"; + } else if(strpos($file, '/') or strpos($file, '\\')) { + echo "

Caracter inválido no nome do arquivo!

"; + } else { + unlink($BASEDIR."/files/".$file); + echo "

Arquivo removido

"; + } +} +if(isset($_REQUEST['submit'])) { + if (empty($_FILES['rfile']["name"])) { + echo "

Nenhum arquivo recebido. Verifique se houve algum problema no upload.

"; + } else { + move_uploaded_file($_FILES['rfile']['tmp_name'], $BASEDIR."/files/".basename($_FILES['rfile']['name'])); + echo "

Envio completo

"; + } + +} +function emUso($file) { + global $mysqli; + $file = "%$file%"; + $res = $mysqli->prepare("SELECT count(*) FROM + (SELECT id_exercicio FROM exercicio WHERE precondicoes LIKE ? + UNION ALL + SELECT id_exercicio FROM teste WHERE condicao LIKE ?) AS x"); + $res->bind_param('ss', $file, $file); + $res->execute(); + $res->bind_result($n_uso); + $res->fetch(); + return($n_uso > 0); +} +?> +

Arquivos cadastrados:

+ +"; + } +?> +
NomeEm uso
".$file.""; + if(emUso($file)) echo ""; + echo "
+

 

+
+ + + Submeter novo arquivo + + + + +
+

 

+ + + + diff --git a/html/cadastra.php b/html/cadastra.php index c34dc7d..8ac3428 100644 --- a/html/cadastra.php +++ b/html/cadastra.php @@ -2,7 +2,7 @@ require_once("head.php"); ### comeca aqui if (! $USER->admin()) { - echo "Acesso negado"; + echo "

Acesso negado

"; exit; } if (isset($_REQUEST['exerc'])) @@ -33,6 +33,28 @@ $nimp++; } +# Codigo de reordenacao de testes +$condicao = $_REQUEST['condicao']; +$peso = $_REQUEST['peso']; +$dica = $_REQUEST['dica']; +$TROCA=-2; +if (isset($_REQUEST['down'])) + $TROCA = $_REQUEST['down']; +if (isset($_REQUEST['up'])) + $TROCA = $_REQUEST['up'] - 1; + +if($TROCA >= 0) { + $tmp = $condicao[$TROCA+1]; + $condicao[$TROCA+1] = $condicao[$TROCA]; + $condicao[$TROCA] = $tmp; + $tmp = $dica[$TROCA+1]; + $dica[$TROCA+1] = $dica[$TROCA]; + $dica[$TROCA] = $tmp; + $tmp = $peso[$TROCA+1]; + $peso[$TROCA+1] = $peso[$TROCA]; + $peso[$TROCA] = $tmp; +} + ?>

Cadastro de exercícios

"; - echo "
".($i+1)."
"; +echo ""; +if($i > 0) + echo ""; +else + echo ""; +echo ($i+1); +if($i == $ntestes - 1) + echo ""; +else + echo ""; + echo""; echo "peso()) echo $T->peso(); else {echo 1;} echo "'>condicao()); echo "\">dica()); echo "\">"; } echo ""; - echo ""; echo ""; } diff --git a/html/class/aluno.php b/html/class/aluno.php index 34c53e0..215c5f5 100644 --- a/html/class/aluno.php +++ b/html/class/aluno.php @@ -17,13 +17,14 @@ public function __construct($id=null) { } public function create($nome, $turma, $senha) { global $mysqli; + if ($nome == " ") return; if (strlen($nome) < 4) - return "O nome $nome é muito curto. Crie usuários com no mínimo 4 caracteres"; + return "

O nome $nome é muito curto. Crie usuários com no mínimo 4 caracteres

"; $res = $mysqli->prepare("INSERT INTO aluno (nome_aluno, id_turma, senha) VALUES (?, ?, SHA1(?))"); $res->bind_param('sis', $nome, $turma->getId(), $senha); $res->execute(); - if ($mysqli->error) return "Houve um erro ao inserir o aluno $nome!"; - else return "Aluno $nome inserido com sucesso"; + if ($mysqli->error) return "

Houve um erro ao inserir o aluno $nome!

"; + else return "

Aluno $nome inserido com sucesso

"; } public function getNome() {return $this->nome;} public function getId() { return $this->id; } @@ -41,7 +42,7 @@ public function numNotas() { public function altera($nome, $admin, $turma, $senha) { global $mysqli; if (strlen($nome) < 4) - return "O nome $nome é muito curto. Crie usuários com no mínimo 4 caracteres"; + return "

O nome $nome é muito curto. Crie usuários com no mínimo 4 caracteres

"; if ($senha) { $res = $mysqli->prepare("UPDATE aluno set nome_aluno=?, admin=?, id_turma=?, senha=SHA1(?) WHERE id_aluno=?"); $res->bind_param('siisi', $nome, $admin, $turma->getId(), $senha, $this->id); @@ -50,8 +51,8 @@ public function altera($nome, $admin, $turma, $senha) { $res->bind_param('siii', $nome, $admin, $turma->getId(), $this->id); } $res->execute(); - if (! $mysqli->error) return "Alterações feitas com sucesso"; - else return "Não foi possível realizar as alterações!"; + if (! $mysqli->error) return "

Alterações feitas com sucesso

"; + else return "

Não foi possível realizar as alterações!

"; } } diff --git a/html/class/exercicio.php b/html/class/exercicio.php index 7dd63c7..b17dd74 100644 --- a/html/class/exercicio.php +++ b/html/class/exercicio.php @@ -44,9 +44,9 @@ public function create($precondicoes, $html, $nome, $testes) { VALUES (REPLACE(?, CHAR(13), ''), ?, ?)"); $res->bind_param('sss', $precondicoes, $html, $nome); $res->execute(); - if ($mysqli->error) return "Erro ao cadastrar o exercício!"; + if ($mysqli->error) return "

Erro ao cadastrar o exercício!

"; $this->id = $mysqli->insert_id; - return $this->cadastraTestes($testes, "Exercício criado"); + return $this->cadastraTestes($testes, "

Exercício criado."); } public function cadastraTestes($testes, $msg) { // E impedimentos, por preguiça do programador global $mysqli; @@ -62,8 +62,8 @@ public function cadastraTestes($testes, $msg) { // E impedimentos, por preguiça $ok = $ok AND $T->create($this->id, $j, $testes[0][$i], $testes[1][$i],$testes[2][$i]); } } - if (! $ok) $msg .= "

Falha ao cadastrar os testes!

"; - else $msg .= " com $c testes. "; + if (! $ok) $msg .= "

Falha ao cadastrar os testes!

"; + else $msg .= " com $c testes.

"; $res = $mysqli->prepare("DELETE FROM proibido WHERE id_exercicio=?"); $res->bind_param('i', $this->id); @@ -76,7 +76,7 @@ public function cadastraTestes($testes, $msg) { // E impedimentos, por preguiça $ok = $ok AND $T->create($testes[3][$i], $this->id); } } - if (! $ok) $msg .= "

Falha ao cadastrar os impedimentos!

"; + if (! $ok) $msg .= "

Falha ao cadastrar os impedimentos!

"; $msg .= "Próximos passos: "; @@ -88,8 +88,8 @@ public function altera ($precondicoes, $html, $nome, $testes) { precondicoes = REPLACE(?, CHAR(13), ''), html=?, nome=? WHERE id_exercicio=?"); $res->bind_param('sssi', $precondicoes, $html, $nome, $this->id); $res->execute(); - if ($mysqli->error) return "Erro ao alterar o exercício!"; - return $this->cadastraTestes($testes, "Exercício alterado"); + if ($mysqli->error) return "

Erro ao alterar o exercício!

"; + return $this->cadastraTestes($testes, "

Exercício alterado"); } public function getNome() {return $this->nome;} public function getHtml() {return $this->html;} @@ -184,7 +184,7 @@ function ListExercicio($turma = null, $reverse = false) { function SelectExercicio () { global $EXERCICIO; global $TURMA; - $T = ""; $T .= ""; foreach (ListExercicio($TURMA) as $exercicio) { $T .="

+

 

+
Insira sua resposta no campo acima e aperte OK

"; +{ echo "

Escolha o arquivo de resposta usando o botão acima

"; } ?>
-
...
diff --git a/html/graficos.php b/html/graficos.php index fad8d7d..169f179 100644 --- a/html/graficos.php +++ b/html/graficos.php @@ -1,6 +1,6 @@ admin()) { - echo "Acesso negado"; + echo "

Acesso negado

"; exit; } ?> diff --git a/html/head.php b/html/head.php index 09cd3a7..77c48e8 100644 --- a/html/head.php +++ b/html/head.php @@ -11,31 +11,50 @@ ?> - + + + + + notaR + + + + + + + + - + - - + + - + + + - - - notaR - +

notaR

diff --git a/html/img/check.png b/html/img/check.png deleted file mode 100644 index ce37384..0000000 Binary files a/html/img/check.png and /dev/null differ diff --git a/html/img/pen.png b/html/img/pen.png deleted file mode 100644 index 2421a41..0000000 Binary files a/html/img/pen.png and /dev/null differ diff --git a/html/img/x.png b/html/img/x.png deleted file mode 100644 index c192223..0000000 Binary files a/html/img/x.png and /dev/null differ diff --git a/html/index.php b/html/index.php index 7e35fe9..92f5ff0 100644 --- a/html/index.php +++ b/html/index.php @@ -1,16 +1,6 @@ - -admin()) { - echo ""; -} +admin()) require("menu.php"); ?>
  getId()) { ?> @@ -31,17 +21,26 @@ } echo ""; } else { // $USER->getId() + if ($USER->admin()) { + echo "
Cadastrar novo exercício

"; + echo "Ver prazos para a turma: "; + echo SelectTurma(); + echo "
"; + $t = $TURMA; + } else { + $t = new Turma ($USER->getTurma()); + } + echo "

Exercícios obrigatórios:

"; - $t = new Turma ($USER->getTurma()); echo ""; foreach (ListExercicio($t) as $X) { echo ""; + echo ""; } echo "
admin()) echo "colspan=2"; echo ">NomeNotaPrazo
"; - if ($USER->admin()) echo ""; - if ($X->getNota() == 100) echo ""; + if ($USER->admin()) echo ""; + if ($X->getNota() == 100) echo ""; echo "".$X->getNome().""; - echo "".$X->getNota()."".$X->getPrazo()."
".$X->getNota()."".$X->getPrazo($t)."
"; echo "

Exercícios opcionais:

"; @@ -50,7 +49,7 @@ echo ">NomeNota"; foreach (ListExercicio($t, true) as $X) { echo ""; - if ($USER->admin()) echo ""; + if ($USER->admin()) echo ""; echo "". $X->getNome()."".$X->getNota().""; } @@ -58,7 +57,6 @@ } // USER->getID() ?> -admin()) echo "

Cadastrar novo exercício

"; ?>
diff --git a/html/java.js b/html/java.js index 1b6ac8f..b5a4501 100644 --- a/html/java.js +++ b/html/java.js @@ -1,23 +1,3 @@ -var GLOBALch; - -function defch() { - var defaultch = 280; - var corr = document.getElementById("corretoR"); - var etc = document.getElementById("etc"); - if (!corr) return; - if (corr.offsetHeight > defaultch) { - GLOBALch = corr.offsetHeight; - corr.style.height = defaultch+'px'; - etc.style.display = "block"; - } -} - -function fullch() { - var corr = document.getElementById("corretoR"); - corr.style.height = GLOBALch+'px'; - etc.style.display = "none"; -} - function delprazo(ex) { var input = document.getElementById("ex"+ex); input.value=""; diff --git a/html/jquery-ui-1.10.2.custom.css b/html/jquery-ui-1.10.2.custom.css deleted file mode 100644 index 6532f0e..0000000 --- a/html/jquery-ui-1.10.2.custom.css +++ /dev/null @@ -1,1175 +0,0 @@ -/*! jQuery UI - v1.10.2 - 2013-04-10 -* http://jqueryui.com -* Includes: jquery.ui.core.css, jquery.ui.resizable.css, jquery.ui.selectable.css, jquery.ui.accordion.css, jquery.ui.autocomplete.css, jquery.ui.button.css, jquery.ui.datepicker.css, jquery.ui.dialog.css, jquery.ui.menu.css, jquery.ui.progressbar.css, jquery.ui.slider.css, jquery.ui.spinner.css, jquery.ui.tabs.css, jquery.ui.tooltip.css -* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Trebuchet%20MS%2CTahoma%2CVerdana%2CArial%2Csans-serif&fwDefault=bold&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=f6a828&bgTextureHeader=gloss_wave&bgImgOpacityHeader=35&borderColorHeader=e78f08&fcHeader=ffffff&iconColorHeader=ffffff&bgColorContent=eeeeee&bgTextureContent=highlight_soft&bgImgOpacityContent=100&borderColorContent=dddddd&fcContent=333333&iconColorContent=222222&bgColorDefault=f6f6f6&bgTextureDefault=glass&bgImgOpacityDefault=100&borderColorDefault=cccccc&fcDefault=1c94c4&iconColorDefault=ef8c08&bgColorHover=fdf5ce&bgTextureHover=glass&bgImgOpacityHover=100&borderColorHover=fbcb09&fcHover=c77405&iconColorHover=ef8c08&bgColorActive=ffffff&bgTextureActive=glass&bgImgOpacityActive=65&borderColorActive=fbd850&fcActive=eb8f00&iconColorActive=ef8c08&bgColorHighlight=ffe45c&bgTextureHighlight=highlight_soft&bgImgOpacityHighlight=75&borderColorHighlight=fed22f&fcHighlight=363636&iconColorHighlight=228ef1&bgColorError=b81900&bgTextureError=diagonals_thick&bgImgOpacityError=18&borderColorError=cd0a0a&fcError=ffffff&iconColorError=ffd27a&bgColorOverlay=666666&bgTextureOverlay=diagonals_thick&bgImgOpacityOverlay=20&opacityOverlay=50&bgColorShadow=000000&bgTextureShadow=flat&bgImgOpacityShadow=10&opacityShadow=20&thicknessShadow=5px&offsetTopShadow=-5px&offsetLeftShadow=-5px&cornerRadiusShadow=5px -* Copyright 2013 jQuery Foundation and other contributors Licensed MIT */ - -/* Layout helpers -----------------------------------*/ -.ui-helper-hidden { - display: none; -} -.ui-helper-hidden-accessible { - border: 0; - clip: rect(0 0 0 0); - height: 1px; - margin: -1px; - overflow: hidden; - padding: 0; - position: absolute; - width: 1px; -} -.ui-helper-reset { - margin: 0; - padding: 0; - border: 0; - outline: 0; - line-height: 1.3; - text-decoration: none; - font-size: 100%; - list-style: none; -} -.ui-helper-clearfix:before, -.ui-helper-clearfix:after { - content: ""; - display: table; - border-collapse: collapse; -} -.ui-helper-clearfix:after { - clear: both; -} -.ui-helper-clearfix { - min-height: 0; /* support: IE7 */ -} -.ui-helper-zfix { - width: 100%; - height: 100%; - top: 0; - left: 0; - position: absolute; - opacity: 0; - filter:Alpha(Opacity=0); -} - -.ui-front { - z-index: 100; -} - - -/* Interaction Cues -----------------------------------*/ -.ui-state-disabled { - cursor: default !important; -} - - -/* Icons -----------------------------------*/ - -/* states and images */ -.ui-icon { - display: block; - text-indent: -99999px; - overflow: hidden; - background-repeat: no-repeat; -} - - -/* Misc visuals -----------------------------------*/ - -/* Overlays */ -.ui-widget-overlay { - position: fixed; - top: 0; - left: 0; - width: 100%; - height: 100%; -} -.ui-resizable { - position: relative; -} -.ui-resizable-handle { - position: absolute; - font-size: 0.1px; - display: block; -} -.ui-resizable-disabled .ui-resizable-handle, -.ui-resizable-autohide .ui-resizable-handle { - display: none; -} -.ui-resizable-n { - cursor: n-resize; - height: 7px; - width: 100%; - top: -5px; - left: 0; -} -.ui-resizable-s { - cursor: s-resize; - height: 7px; - width: 100%; - bottom: -5px; - left: 0; -} -.ui-resizable-e { - cursor: e-resize; - width: 7px; - right: -5px; - top: 0; - height: 100%; -} -.ui-resizable-w { - cursor: w-resize; - width: 7px; - left: -5px; - top: 0; - height: 100%; -} -.ui-resizable-se { - cursor: se-resize; - width: 12px; - height: 12px; - right: 1px; - bottom: 1px; -} -.ui-resizable-sw { - cursor: sw-resize; - width: 9px; - height: 9px; - left: -5px; - bottom: -5px; -} -.ui-resizable-nw { - cursor: nw-resize; - width: 9px; - height: 9px; - left: -5px; - top: -5px; -} -.ui-resizable-ne { - cursor: ne-resize; - width: 9px; - height: 9px; - right: -5px; - top: -5px; -} -.ui-selectable-helper { - position: absolute; - z-index: 100; - border: 1px dotted black; -} -.ui-accordion .ui-accordion-header { - display: block; - cursor: pointer; - position: relative; - margin-top: 2px; - padding: .5em .5em .5em .7em; - min-height: 0; /* support: IE7 */ -} -.ui-accordion .ui-accordion-icons { - padding-left: 2.2em; -} -.ui-accordion .ui-accordion-noicons { - padding-left: .7em; -} -.ui-accordion .ui-accordion-icons .ui-accordion-icons { - padding-left: 2.2em; -} -.ui-accordion .ui-accordion-header .ui-accordion-header-icon { - position: absolute; - left: .5em; - top: 50%; - margin-top: -8px; -} -.ui-accordion .ui-accordion-content { - padding: 1em 2.2em; - border-top: 0; - overflow: auto; -} -.ui-autocomplete { - position: absolute; - top: 0; - left: 0; - cursor: default; -} -.ui-button { - display: inline-block; - position: relative; - padding: 0; - line-height: normal; - margin-right: .1em; - cursor: pointer; - vertical-align: middle; - text-align: center; - overflow: visible; /* removes extra width in IE */ -} -.ui-button, -.ui-button:link, -.ui-button:visited, -.ui-button:hover, -.ui-button:active { - text-decoration: none; -} -/* to make room for the icon, a width needs to be set here */ -.ui-button-icon-only { - width: 2.2em; -} -/* button elements seem to need a little more width */ -button.ui-button-icon-only { - width: 2.4em; -} -.ui-button-icons-only { - width: 3.4em; -} -button.ui-button-icons-only { - width: 3.7em; -} - -/* button text element */ -.ui-button .ui-button-text { - display: block; - line-height: normal; -} -.ui-button-text-only .ui-button-text { - padding: .4em 1em; -} -.ui-button-icon-only .ui-button-text, -.ui-button-icons-only .ui-button-text { - padding: .4em; - text-indent: -9999999px; -} -.ui-button-text-icon-primary .ui-button-text, -.ui-button-text-icons .ui-button-text { - padding: .4em 1em .4em 2.1em; -} -.ui-button-text-icon-secondary .ui-button-text, -.ui-button-text-icons .ui-button-text { - padding: .4em 2.1em .4em 1em; -} -.ui-button-text-icons .ui-button-text { - padding-left: 2.1em; - padding-right: 2.1em; -} -/* no icon support for input elements, provide padding by default */ -input.ui-button { - padding: .4em 1em; -} - -/* button icon element(s) */ -.ui-button-icon-only .ui-icon, -.ui-button-text-icon-primary .ui-icon, -.ui-button-text-icon-secondary .ui-icon, -.ui-button-text-icons .ui-icon, -.ui-button-icons-only .ui-icon { - position: absolute; - top: 50%; - margin-top: -8px; -} -.ui-button-icon-only .ui-icon { - left: 50%; - margin-left: -8px; -} -.ui-button-text-icon-primary .ui-button-icon-primary, -.ui-button-text-icons .ui-button-icon-primary, -.ui-button-icons-only .ui-button-icon-primary { - left: .5em; -} -.ui-button-text-icon-secondary .ui-button-icon-secondary, -.ui-button-text-icons .ui-button-icon-secondary, -.ui-button-icons-only .ui-button-icon-secondary { - right: .5em; -} - -/* button sets */ -.ui-buttonset { - margin-right: 7px; -} -.ui-buttonset .ui-button { - margin-left: 0; - margin-right: -.3em; -} - -/* workarounds */ -/* reset extra padding in Firefox, see h5bp.com/l */ -input.ui-button::-moz-focus-inner, -button.ui-button::-moz-focus-inner { - border: 0; - padding: 0; -} -.ui-datepicker { - width: 17em; - padding: .2em .2em 0; - display: none; -} -.ui-datepicker .ui-datepicker-header { - position: relative; - padding: .2em 0; -} -.ui-datepicker .ui-datepicker-prev, -.ui-datepicker .ui-datepicker-next { - position: absolute; - top: 2px; - width: 1.8em; - height: 1.8em; -} -.ui-datepicker .ui-datepicker-prev-hover, -.ui-datepicker .ui-datepicker-next-hover { - top: 1px; -} -.ui-datepicker .ui-datepicker-prev { - left: 2px; -} -.ui-datepicker .ui-datepicker-next { - right: 2px; -} -.ui-datepicker .ui-datepicker-prev-hover { - left: 1px; -} -.ui-datepicker .ui-datepicker-next-hover { - right: 1px; -} -.ui-datepicker .ui-datepicker-prev span, -.ui-datepicker .ui-datepicker-next span { - display: block; - position: absolute; - left: 50%; - margin-left: -8px; - top: 50%; - margin-top: -8px; -} -.ui-datepicker .ui-datepicker-title { - margin: 0 2.3em; - line-height: 1.8em; - text-align: center; -} -.ui-datepicker .ui-datepicker-title select { - font-size: 1em; - margin: 1px 0; -} -.ui-datepicker select.ui-datepicker-month-year { - width: 100%; -} -.ui-datepicker select.ui-datepicker-month, -.ui-datepicker select.ui-datepicker-year { - width: 49%; -} -.ui-datepicker table { - width: 100%; - font-size: .9em; - border-collapse: collapse; - margin: 0 0 .4em; -} -.ui-datepicker th { - padding: .7em .3em; - text-align: center; - font-weight: bold; - border: 0; -} -.ui-datepicker td { - border: 0; - padding: 1px; -} -.ui-datepicker td span, -.ui-datepicker td a { - display: block; - padding: .2em; - text-align: right; - text-decoration: none; -} -.ui-datepicker .ui-datepicker-buttonpane { - background-image: none; - margin: .7em 0 0 0; - padding: 0 .2em; - border-left: 0; - border-right: 0; - border-bottom: 0; -} -.ui-datepicker .ui-datepicker-buttonpane button { - float: right; - margin: .5em .2em .4em; - cursor: pointer; - padding: .2em .6em .3em .6em; - width: auto; - overflow: visible; -} -.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { - float: left; -} - -/* with multiple calendars */ -.ui-datepicker.ui-datepicker-multi { - width: auto; -} -.ui-datepicker-multi .ui-datepicker-group { - float: left; -} -.ui-datepicker-multi .ui-datepicker-group table { - width: 95%; - margin: 0 auto .4em; -} -.ui-datepicker-multi-2 .ui-datepicker-group { - width: 50%; -} -.ui-datepicker-multi-3 .ui-datepicker-group { - width: 33.3%; -} -.ui-datepicker-multi-4 .ui-datepicker-group { - width: 25%; -} -.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header, -.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { - border-left-width: 0; -} -.ui-datepicker-multi .ui-datepicker-buttonpane { - clear: left; -} -.ui-datepicker-row-break { - clear: both; - width: 100%; - font-size: 0; -} - -/* RTL support */ -.ui-datepicker-rtl { - direction: rtl; -} -.ui-datepicker-rtl .ui-datepicker-prev { - right: 2px; - left: auto; -} -.ui-datepicker-rtl .ui-datepicker-next { - left: 2px; - right: auto; -} -.ui-datepicker-rtl .ui-datepicker-prev:hover { - right: 1px; - left: auto; -} -.ui-datepicker-rtl .ui-datepicker-next:hover { - left: 1px; - right: auto; -} -.ui-datepicker-rtl .ui-datepicker-buttonpane { - clear: right; -} -.ui-datepicker-rtl .ui-datepicker-buttonpane button { - float: left; -} -.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current, -.ui-datepicker-rtl .ui-datepicker-group { - float: right; -} -.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header, -.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { - border-right-width: 0; - border-left-width: 1px; -} -.ui-dialog { - position: absolute; - top: 0; - left: 0; - padding: .2em; - outline: 0; -} -.ui-dialog .ui-dialog-titlebar { - padding: .4em 1em; - position: relative; -} -.ui-dialog .ui-dialog-title { - float: left; - margin: .1em 0; - white-space: nowrap; - width: 90%; - overflow: hidden; - text-overflow: ellipsis; -} -.ui-dialog .ui-dialog-titlebar-close { - position: absolute; - right: .3em; - top: 50%; - width: 21px; - margin: -10px 0 0 0; - padding: 1px; - height: 20px; -} -.ui-dialog .ui-dialog-content { - position: relative; - border: 0; - padding: .5em 1em; - background: none; - overflow: auto; -} -.ui-dialog .ui-dialog-buttonpane { - text-align: left; - border-width: 1px 0 0 0; - background-image: none; - margin-top: .5em; - padding: .3em 1em .5em .4em; -} -.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { - float: right; -} -.ui-dialog .ui-dialog-buttonpane button { - margin: .5em .4em .5em 0; - cursor: pointer; -} -.ui-dialog .ui-resizable-se { - width: 12px; - height: 12px; - right: -5px; - bottom: -5px; - background-position: 16px 16px; -} -.ui-draggable .ui-dialog-titlebar { - cursor: move; -} -.ui-menu { - list-style: none; - padding: 2px; - margin: 0; - display: block; - outline: none; -} -.ui-menu .ui-menu { - margin-top: -3px; - position: absolute; -} -.ui-menu .ui-menu-item { - margin: 0; - padding: 0; - width: 100%; -} -.ui-menu .ui-menu-divider { - margin: 5px -2px 5px -2px; - height: 0; - font-size: 0; - line-height: 0; - border-width: 1px 0 0 0; -} -.ui-menu .ui-menu-item a { - text-decoration: none; - display: block; - padding: 2px .4em; - line-height: 1.5; - min-height: 0; /* support: IE7 */ - font-weight: normal; -} -.ui-menu .ui-menu-item a.ui-state-focus, -.ui-menu .ui-menu-item a.ui-state-active { - font-weight: normal; - margin: -1px; -} - -.ui-menu .ui-state-disabled { - font-weight: normal; - margin: .4em 0 .2em; - line-height: 1.5; -} -.ui-menu .ui-state-disabled a { - cursor: default; -} - -/* icon support */ -.ui-menu-icons { - position: relative; -} -.ui-menu-icons .ui-menu-item a { - position: relative; - padding-left: 2em; -} - -/* left-aligned */ -.ui-menu .ui-icon { - position: absolute; - top: .2em; - left: .2em; -} - -/* right-aligned */ -.ui-menu .ui-menu-icon { - position: static; - float: right; -} -.ui-progressbar { - height: 2em; - text-align: left; - overflow: hidden; -} -.ui-progressbar .ui-progressbar-value { - margin: -1px; - height: 100%; -} -.ui-progressbar .ui-progressbar-overlay { - background: url("images/animated-overlay.gif"); - height: 100%; - filter: alpha(opacity=25); - opacity: 0.25; -} -.ui-progressbar-indeterminate .ui-progressbar-value { - background-image: none; -} -.ui-slider { - position: relative; - text-align: left; -} -.ui-slider .ui-slider-handle { - position: absolute; - z-index: 2; - width: 1.2em; - height: 1.2em; - cursor: default; -} -.ui-slider .ui-slider-range { - position: absolute; - z-index: 1; - font-size: .7em; - display: block; - border: 0; - background-position: 0 0; -} - -/* For IE8 - See #6727 */ -.ui-slider.ui-state-disabled .ui-slider-handle, -.ui-slider.ui-state-disabled .ui-slider-range { - filter: inherit; -} - -.ui-slider-horizontal { - height: .8em; -} -.ui-slider-horizontal .ui-slider-handle { - top: -.3em; - margin-left: -.6em; -} -.ui-slider-horizontal .ui-slider-range { - top: 0; - height: 100%; -} -.ui-slider-horizontal .ui-slider-range-min { - left: 0; -} -.ui-slider-horizontal .ui-slider-range-max { - right: 0; -} - -.ui-slider-vertical { - width: .8em; - height: 100px; -} -.ui-slider-vertical .ui-slider-handle { - left: -.3em; - margin-left: 0; - margin-bottom: -.6em; -} -.ui-slider-vertical .ui-slider-range { - left: 0; - width: 100%; -} -.ui-slider-vertical .ui-slider-range-min { - bottom: 0; -} -.ui-slider-vertical .ui-slider-range-max { - top: 0; -} -.ui-spinner { - position: relative; - display: inline-block; - overflow: hidden; - padding: 0; - vertical-align: middle; -} -.ui-spinner-input { - border: none; - background: none; - color: inherit; - padding: 0; - margin: .2em 0; - vertical-align: middle; - margin-left: .4em; - margin-right: 22px; -} -.ui-spinner-button { - width: 16px; - height: 50%; - font-size: .5em; - padding: 0; - margin: 0; - text-align: center; - position: absolute; - cursor: default; - display: block; - overflow: hidden; - right: 0; -} -/* more specificity required here to overide default borders */ -.ui-spinner a.ui-spinner-button { - border-top: none; - border-bottom: none; - border-right: none; -} -/* vertical centre icon */ -.ui-spinner .ui-icon { - position: absolute; - margin-top: -8px; - top: 50%; - left: 0; -} -.ui-spinner-up { - top: 0; -} -.ui-spinner-down { - bottom: 0; -} - -/* TR overrides */ -.ui-spinner .ui-icon-triangle-1-s { - /* need to fix icons sprite */ - background-position: -65px -16px; -} -.ui-tabs { - position: relative;/* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */ - padding: .2em; -} -.ui-tabs .ui-tabs-nav { - margin: 0; - padding: .2em .2em 0; -} -.ui-tabs .ui-tabs-nav li { - list-style: none; - float: left; - position: relative; - top: 0; - margin: 1px .2em 0 0; - border-bottom-width: 0; - padding: 0; - white-space: nowrap; -} -.ui-tabs .ui-tabs-nav li a { - float: left; - padding: .5em 1em; - text-decoration: none; -} -.ui-tabs .ui-tabs-nav li.ui-tabs-active { - margin-bottom: -1px; - padding-bottom: 1px; -} -.ui-tabs .ui-tabs-nav li.ui-tabs-active a, -.ui-tabs .ui-tabs-nav li.ui-state-disabled a, -.ui-tabs .ui-tabs-nav li.ui-tabs-loading a { - cursor: text; -} -.ui-tabs .ui-tabs-nav li a, /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */ -.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active a { - cursor: pointer; -} -.ui-tabs .ui-tabs-panel { - display: block; - border-width: 0; - padding: 1em 1.4em; - background: none; -} -.ui-tooltip { - padding: 8px; - position: absolute; - z-index: 9999; - max-width: 300px; - -webkit-box-shadow: 0 0 5px #aaa; - box-shadow: 0 0 5px #aaa; -} -body .ui-tooltip { - border-width: 2px; -} - -/* Component containers -----------------------------------*/ -.ui-widget { - font-family: Trebuchet MS,Tahoma,Verdana,Arial,sans-serif; - font-size: 1.1em; -} -.ui-widget .ui-widget { - font-size: 1em; -} -.ui-widget input, -.ui-widget select, -.ui-widget textarea, -.ui-widget button { - font-family: Trebuchet MS,Tahoma,Verdana,Arial,sans-serif; - font-size: 1em; -} -.ui-widget-content { - border: 1px solid #dddddd; - background: #eeeeee url(images/ui-bg_highlight-soft_100_eeeeee_1x100.png) 50% top repeat-x; - color: #333333; -} -.ui-widget-content a { - color: #333333; -} -.ui-widget-header { - border: 1px solid #e78f08; - background: #f6a828 url(images/ui-bg_gloss-wave_35_f6a828_500x100.png) 50% 50% repeat-x; - color: #ffffff; - font-weight: bold; -} -.ui-widget-header a { - color: #ffffff; -} - -/* Interaction states -----------------------------------*/ -.ui-state-default, -.ui-widget-content .ui-state-default, -.ui-widget-header .ui-state-default { - border: 1px solid #cccccc; - background: #f6f6f6 url(images/ui-bg_glass_100_f6f6f6_1x400.png) 50% 50% repeat-x; - font-weight: bold; - color: #1c94c4; -} -.ui-state-default a, -.ui-state-default a:link, -.ui-state-default a:visited { - color: #1c94c4; - text-decoration: none; -} -.ui-state-hover, -.ui-widget-content .ui-state-hover, -.ui-widget-header .ui-state-hover, -.ui-state-focus, -.ui-widget-content .ui-state-focus, -.ui-widget-header .ui-state-focus { - border: 1px solid #fbcb09; - background: #fdf5ce url(images/ui-bg_glass_100_fdf5ce_1x400.png) 50% 50% repeat-x; - font-weight: bold; - color: #c77405; -} -.ui-state-hover a, -.ui-state-hover a:hover, -.ui-state-hover a:link, -.ui-state-hover a:visited { - color: #c77405; - text-decoration: none; -} -.ui-state-active, -.ui-widget-content .ui-state-active, -.ui-widget-header .ui-state-active { - border: 1px solid #fbd850; - background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; - font-weight: bold; - color: #eb8f00; -} -.ui-state-active a, -.ui-state-active a:link, -.ui-state-active a:visited { - color: #eb8f00; - text-decoration: none; -} - -/* Interaction Cues -----------------------------------*/ -.ui-state-highlight, -.ui-widget-content .ui-state-highlight, -.ui-widget-header .ui-state-highlight { - border: 1px solid #fed22f; - background: #ffe45c url(images/ui-bg_highlight-soft_75_ffe45c_1x100.png) 50% top repeat-x; - color: #363636; -} -.ui-state-highlight a, -.ui-widget-content .ui-state-highlight a, -.ui-widget-header .ui-state-highlight a { - color: #363636; -} -.ui-state-error, -.ui-widget-content .ui-state-error, -.ui-widget-header .ui-state-error { - border: 1px solid #cd0a0a; - background: #b81900 url(images/ui-bg_diagonals-thick_18_b81900_40x40.png) 50% 50% repeat; - color: #ffffff; -} -.ui-state-error a, -.ui-widget-content .ui-state-error a, -.ui-widget-header .ui-state-error a { - color: #ffffff; -} -.ui-state-error-text, -.ui-widget-content .ui-state-error-text, -.ui-widget-header .ui-state-error-text { - color: #ffffff; -} -.ui-priority-primary, -.ui-widget-content .ui-priority-primary, -.ui-widget-header .ui-priority-primary { - font-weight: bold; -} -.ui-priority-secondary, -.ui-widget-content .ui-priority-secondary, -.ui-widget-header .ui-priority-secondary { - opacity: .7; - filter:Alpha(Opacity=70); - font-weight: normal; -} -.ui-state-disabled, -.ui-widget-content .ui-state-disabled, -.ui-widget-header .ui-state-disabled { - opacity: .35; - filter:Alpha(Opacity=35); - background-image: none; -} -.ui-state-disabled .ui-icon { - filter:Alpha(Opacity=35); /* For IE8 - See #6059 */ -} - -/* Icons -----------------------------------*/ - -/* states and images */ -.ui-icon { - width: 16px; - height: 16px; -} -.ui-icon, -.ui-widget-content .ui-icon { - background-image: url(images/ui-icons_222222_256x240.png); -} -.ui-widget-header .ui-icon { - background-image: url(images/ui-icons_ffffff_256x240.png); -} -.ui-state-default .ui-icon { - background-image: url(images/ui-icons_ef8c08_256x240.png); -} -.ui-state-hover .ui-icon, -.ui-state-focus .ui-icon { - background-image: url(images/ui-icons_ef8c08_256x240.png); -} -.ui-state-active .ui-icon { - background-image: url(images/ui-icons_ef8c08_256x240.png); -} -.ui-state-highlight .ui-icon { - background-image: url(images/ui-icons_228ef1_256x240.png); -} -.ui-state-error .ui-icon, -.ui-state-error-text .ui-icon { - background-image: url(images/ui-icons_ffd27a_256x240.png); -} - -/* positioning */ -.ui-icon-blank { background-position: 16px 16px; } -.ui-icon-carat-1-n { background-position: 0 0; } -.ui-icon-carat-1-ne { background-position: -16px 0; } -.ui-icon-carat-1-e { background-position: -32px 0; } -.ui-icon-carat-1-se { background-position: -48px 0; } -.ui-icon-carat-1-s { background-position: -64px 0; } -.ui-icon-carat-1-sw { background-position: -80px 0; } -.ui-icon-carat-1-w { background-position: -96px 0; } -.ui-icon-carat-1-nw { background-position: -112px 0; } -.ui-icon-carat-2-n-s { background-position: -128px 0; } -.ui-icon-carat-2-e-w { background-position: -144px 0; } -.ui-icon-triangle-1-n { background-position: 0 -16px; } -.ui-icon-triangle-1-ne { background-position: -16px -16px; } -.ui-icon-triangle-1-e { background-position: -32px -16px; } -.ui-icon-triangle-1-se { background-position: -48px -16px; } -.ui-icon-triangle-1-s { background-position: -64px -16px; } -.ui-icon-triangle-1-sw { background-position: -80px -16px; } -.ui-icon-triangle-1-w { background-position: -96px -16px; } -.ui-icon-triangle-1-nw { background-position: -112px -16px; } -.ui-icon-triangle-2-n-s { background-position: -128px -16px; } -.ui-icon-triangle-2-e-w { background-position: -144px -16px; } -.ui-icon-arrow-1-n { background-position: 0 -32px; } -.ui-icon-arrow-1-ne { background-position: -16px -32px; } -.ui-icon-arrow-1-e { background-position: -32px -32px; } -.ui-icon-arrow-1-se { background-position: -48px -32px; } -.ui-icon-arrow-1-s { background-position: -64px -32px; } -.ui-icon-arrow-1-sw { background-position: -80px -32px; } -.ui-icon-arrow-1-w { background-position: -96px -32px; } -.ui-icon-arrow-1-nw { background-position: -112px -32px; } -.ui-icon-arrow-2-n-s { background-position: -128px -32px; } -.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; } -.ui-icon-arrow-2-e-w { background-position: -160px -32px; } -.ui-icon-arrow-2-se-nw { background-position: -176px -32px; } -.ui-icon-arrowstop-1-n { background-position: -192px -32px; } -.ui-icon-arrowstop-1-e { background-position: -208px -32px; } -.ui-icon-arrowstop-1-s { background-position: -224px -32px; } -.ui-icon-arrowstop-1-w { background-position: -240px -32px; } -.ui-icon-arrowthick-1-n { background-position: 0 -48px; } -.ui-icon-arrowthick-1-ne { background-position: -16px -48px; } -.ui-icon-arrowthick-1-e { background-position: -32px -48px; } -.ui-icon-arrowthick-1-se { background-position: -48px -48px; } -.ui-icon-arrowthick-1-s { background-position: -64px -48px; } -.ui-icon-arrowthick-1-sw { background-position: -80px -48px; } -.ui-icon-arrowthick-1-w { background-position: -96px -48px; } -.ui-icon-arrowthick-1-nw { background-position: -112px -48px; } -.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; } -.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; } -.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; } -.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; } -.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; } -.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; } -.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; } -.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; } -.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; } -.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; } -.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; } -.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; } -.ui-icon-arrowreturn-1-w { background-position: -64px -64px; } -.ui-icon-arrowreturn-1-n { background-position: -80px -64px; } -.ui-icon-arrowreturn-1-e { background-position: -96px -64px; } -.ui-icon-arrowreturn-1-s { background-position: -112px -64px; } -.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; } -.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; } -.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; } -.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; } -.ui-icon-arrow-4 { background-position: 0 -80px; } -.ui-icon-arrow-4-diag { background-position: -16px -80px; } -.ui-icon-extlink { background-position: -32px -80px; } -.ui-icon-newwin { background-position: -48px -80px; } -.ui-icon-refresh { background-position: -64px -80px; } -.ui-icon-shuffle { background-position: -80px -80px; } -.ui-icon-transfer-e-w { background-position: -96px -80px; } -.ui-icon-transferthick-e-w { background-position: -112px -80px; } -.ui-icon-folder-collapsed { background-position: 0 -96px; } -.ui-icon-folder-open { background-position: -16px -96px; } -.ui-icon-document { background-position: -32px -96px; } -.ui-icon-document-b { background-position: -48px -96px; } -.ui-icon-note { background-position: -64px -96px; } -.ui-icon-mail-closed { background-position: -80px -96px; } -.ui-icon-mail-open { background-position: -96px -96px; } -.ui-icon-suitcase { background-position: -112px -96px; } -.ui-icon-comment { background-position: -128px -96px; } -.ui-icon-person { background-position: -144px -96px; } -.ui-icon-print { background-position: -160px -96px; } -.ui-icon-trash { background-position: -176px -96px; } -.ui-icon-locked { background-position: -192px -96px; } -.ui-icon-unlocked { background-position: -208px -96px; } -.ui-icon-bookmark { background-position: -224px -96px; } -.ui-icon-tag { background-position: -240px -96px; } -.ui-icon-home { background-position: 0 -112px; } -.ui-icon-flag { background-position: -16px -112px; } -.ui-icon-calendar { background-position: -32px -112px; } -.ui-icon-cart { background-position: -48px -112px; } -.ui-icon-pencil { background-position: -64px -112px; } -.ui-icon-clock { background-position: -80px -112px; } -.ui-icon-disk { background-position: -96px -112px; } -.ui-icon-calculator { background-position: -112px -112px; } -.ui-icon-zoomin { background-position: -128px -112px; } -.ui-icon-zoomout { background-position: -144px -112px; } -.ui-icon-search { background-position: -160px -112px; } -.ui-icon-wrench { background-position: -176px -112px; } -.ui-icon-gear { background-position: -192px -112px; } -.ui-icon-heart { background-position: -208px -112px; } -.ui-icon-star { background-position: -224px -112px; } -.ui-icon-link { background-position: -240px -112px; } -.ui-icon-cancel { background-position: 0 -128px; } -.ui-icon-plus { background-position: -16px -128px; } -.ui-icon-plusthick { background-position: -32px -128px; } -.ui-icon-minus { background-position: -48px -128px; } -.ui-icon-minusthick { background-position: -64px -128px; } -.ui-icon-close { background-position: -80px -128px; } -.ui-icon-closethick { background-position: -96px -128px; } -.ui-icon-key { background-position: -112px -128px; } -.ui-icon-lightbulb { background-position: -128px -128px; } -.ui-icon-scissors { background-position: -144px -128px; } -.ui-icon-clipboard { background-position: -160px -128px; } -.ui-icon-copy { background-position: -176px -128px; } -.ui-icon-contact { background-position: -192px -128px; } -.ui-icon-image { background-position: -208px -128px; } -.ui-icon-video { background-position: -224px -128px; } -.ui-icon-script { background-position: -240px -128px; } -.ui-icon-alert { background-position: 0 -144px; } -.ui-icon-info { background-position: -16px -144px; } -.ui-icon-notice { background-position: -32px -144px; } -.ui-icon-help { background-position: -48px -144px; } -.ui-icon-check { background-position: -64px -144px; } -.ui-icon-bullet { background-position: -80px -144px; } -.ui-icon-radio-on { background-position: -96px -144px; } -.ui-icon-radio-off { background-position: -112px -144px; } -.ui-icon-pin-w { background-position: -128px -144px; } -.ui-icon-pin-s { background-position: -144px -144px; } -.ui-icon-play { background-position: 0 -160px; } -.ui-icon-pause { background-position: -16px -160px; } -.ui-icon-seek-next { background-position: -32px -160px; } -.ui-icon-seek-prev { background-position: -48px -160px; } -.ui-icon-seek-end { background-position: -64px -160px; } -.ui-icon-seek-start { background-position: -80px -160px; } -/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */ -.ui-icon-seek-first { background-position: -80px -160px; } -.ui-icon-stop { background-position: -96px -160px; } -.ui-icon-eject { background-position: -112px -160px; } -.ui-icon-volume-off { background-position: -128px -160px; } -.ui-icon-volume-on { background-position: -144px -160px; } -.ui-icon-power { background-position: 0 -176px; } -.ui-icon-signal-diag { background-position: -16px -176px; } -.ui-icon-signal { background-position: -32px -176px; } -.ui-icon-battery-0 { background-position: -48px -176px; } -.ui-icon-battery-1 { background-position: -64px -176px; } -.ui-icon-battery-2 { background-position: -80px -176px; } -.ui-icon-battery-3 { background-position: -96px -176px; } -.ui-icon-circle-plus { background-position: 0 -192px; } -.ui-icon-circle-minus { background-position: -16px -192px; } -.ui-icon-circle-close { background-position: -32px -192px; } -.ui-icon-circle-triangle-e { background-position: -48px -192px; } -.ui-icon-circle-triangle-s { background-position: -64px -192px; } -.ui-icon-circle-triangle-w { background-position: -80px -192px; } -.ui-icon-circle-triangle-n { background-position: -96px -192px; } -.ui-icon-circle-arrow-e { background-position: -112px -192px; } -.ui-icon-circle-arrow-s { background-position: -128px -192px; } -.ui-icon-circle-arrow-w { background-position: -144px -192px; } -.ui-icon-circle-arrow-n { background-position: -160px -192px; } -.ui-icon-circle-zoomin { background-position: -176px -192px; } -.ui-icon-circle-zoomout { background-position: -192px -192px; } -.ui-icon-circle-check { background-position: -208px -192px; } -.ui-icon-circlesmall-plus { background-position: 0 -208px; } -.ui-icon-circlesmall-minus { background-position: -16px -208px; } -.ui-icon-circlesmall-close { background-position: -32px -208px; } -.ui-icon-squaresmall-plus { background-position: -48px -208px; } -.ui-icon-squaresmall-minus { background-position: -64px -208px; } -.ui-icon-squaresmall-close { background-position: -80px -208px; } -.ui-icon-grip-dotted-vertical { background-position: 0 -224px; } -.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; } -.ui-icon-grip-solid-vertical { background-position: -32px -224px; } -.ui-icon-grip-solid-horizontal { background-position: -48px -224px; } -.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; } -.ui-icon-grip-diagonal-se { background-position: -80px -224px; } - - -/* Misc visuals -----------------------------------*/ - -/* Corner radius */ -.ui-corner-all, -.ui-corner-top, -.ui-corner-left, -.ui-corner-tl { - border-top-left-radius: 4px; -} -.ui-corner-all, -.ui-corner-top, -.ui-corner-right, -.ui-corner-tr { - border-top-right-radius: 4px; -} -.ui-corner-all, -.ui-corner-bottom, -.ui-corner-left, -.ui-corner-bl { - border-bottom-left-radius: 4px; -} -.ui-corner-all, -.ui-corner-bottom, -.ui-corner-right, -.ui-corner-br { - border-bottom-right-radius: 4px; -} - -/* Overlays */ -.ui-widget-overlay { - background: #666666 url(images/ui-bg_diagonals-thick_20_666666_40x40.png) 50% 50% repeat; - opacity: .5; - filter: Alpha(Opacity=50); -} -.ui-widget-shadow { - margin: -5px 0 0 -5px; - padding: 5px; - background: #000000 url(images/ui-bg_flat_10_000000_40x100.png) 50% 50% repeat-x; - opacity: .2; - filter: Alpha(Opacity=20); - border-radius: 5px; -} diff --git a/html/menu.php b/html/menu.php new file mode 100644 index 0000000..1a21e0f --- /dev/null +++ b/html/menu.php @@ -0,0 +1,14 @@ + +Administrar:
+
Relatórios:
"; +?> diff --git a/html/notas.php b/html/notas.php index 40d2996..bf18440 100644 --- a/html/notas.php +++ b/html/notas.php @@ -1,7 +1,7 @@ admin()) { - echo "Acesso negado"; + echo "

Acesso negado

"; exit; } ?> diff --git a/html/plagio.php b/html/plagio.php index 435414f..fba9c51 100644 --- a/html/plagio.php +++ b/html/plagio.php @@ -1,6 +1,6 @@ admin()) { - echo "Acesso negado"; + echo "

Acesso negado

"; exit; } ?> @@ -8,7 +8,7 @@

Este relatório indica pares de alunos que entregaram exercícios idênticos em diversas ocasiões.

Clique no botão abaixo para gerar o relatório.

-

Atenção! Como este relatório precisa consultar todos os exercícios que já foram entregues, ele pode demorar muito para completar. Evite solicitar este relatório em horários de muita utilização do sistema. +

Atenção! Como este relatório precisa consultar todos os exercícios que já foram entregues, ele pode demorar muito para completar. Evite solicitar este relatório em horários de muita utilização do sistema.

diff --git a/html/prazos.php b/html/prazos.php index e5a3f56..a70cdab 100644 --- a/html/prazos.php +++ b/html/prazos.php @@ -1,9 +1,12 @@ admin()) { - echo "Acesso negado"; + echo "

Acesso negado

"; exit; } - +require('menu.php'); +?> +

Administração de prazos

+Prazos alterados!

"; + else echo "

Houveram erros ao alterar os prazos! Confira os valores abaixo!!

"; } ?> -

Administração de prazos

- +

Prazos cadastrados para a turma:

- +
"; } ?> diff --git a/html/proibidos.php b/html/proibidos.php new file mode 100644 index 0000000..f1f7ba0 --- /dev/null +++ b/html/proibidos.php @@ -0,0 +1,58 @@ +admin()) { + echo "

Acesso negado

"; + exit; +} +require('menu.php'); +?> +

Administração de impedimentos

+remove()) + echo "

Impedimento removido

"; + else + echo "

Erro ao remover impedimento!

"; +} +if(isset($_REQUEST['submit'])) { + $pr = new Proibidos(); + if ($pr->create($_REQUEST['nome'])) + echo "

Impedimento criado

"; + else + echo "

Erro ao criar impedimento!

"; +} +?> +

Impedimentos globais cadastrados:

+

(Para detalhes de como impedimentos funcionam, veja aqui). +

ExercícioData
".$ex->getNome().""; echo ""; echo ""; - echo ""; + echo ""; echo "
+"; +} +?> +
Palavra
"; + if (!$pr->getHard()) + echo ""; + echo "".$pr->getPalavra()."
+ +

Exercícios com impedimentos locais:

+ +"; +} +?> +
PalavraExercício
"; + $EX = new Exercicio($pr->getExercicio()); + echo ""; + echo "".$pr->getPalavra()."".$EX->getNome()."
+ + +

 

+

Criar novo impedimento global:

+

+ + + + + diff --git a/html/senha.php b/html/senha.php index b441b14..7abd525 100644 --- a/html/senha.php +++ b/html/senha.php @@ -1,6 +1,6 @@ getId()) { - echo "Você precisa estar logado para acessar esta página."; + echo "

Você precisa estar logado para acessar esta página.

"; exit; } ?> @@ -12,12 +12,13 @@ if(!empty($_POST['senha'])) { if ($_POST['senha'] === $_POST['senha2']) { $USER->altera($USER->getNome(), $USER->admin(), new Turma($USER->getTurma()), $_POST['senha']); - echo "

Senha alterada!

"; + echo "

Senha alterada!

"; + } else { + echo "

As senhas digitadas não são iguais!

"; } - else { - echo "As senhas digitadas não são iguais!"; - } - } + } else { + echo "

Campo 'senha' em branco!

"; + } } ?>
diff --git a/html/style.css b/html/style.css index 4f10199..4c75074 100644 --- a/html/style.css +++ b/html/style.css @@ -1,42 +1,33 @@ -#etc { - margin-left: auto; - margin-right: auto; - margin-top:-30px; - width: 30px; - height: 20px; - border: 2px solid #078; - background-color: #cef; - text-align: center; - font-family: Arial; - font-weight: 900; - border-radius: 5px; - display: none; - cursor:pointer; +form { + max-width: 500px; +} +.alert { + max-width: 500px; +} +.icon-ok { + color: #0f8; + padding-right: 3px; } th { - border: 2px solid #fcc; + border: 1px solid #888; font-weight: bold; border-radius: 2px; font-size: 17px; + padding: 5px; } td { border-radius: 2px; - border: 2px solid #fcc; + border: 1px solid #888; font-size: 16px; + padding: 5px; } #Menu { + padding: 3px; position: relative; width: 190px; float: right; - border: 2px dashed #fcc; -} -#Erro { - font-size: 13px; - color: #d66; - border: 2px dashed #d66; - width: 50%; - padding: 15px; + border: 0.5px dashed #555; } .Cadastra td { border: none;} #Top { @@ -59,11 +50,24 @@ td { overflow: auto; font-style: normal; } -input { +input[type="text"] { + margin: 4px 0px 4px 0px; + background-color: #eee; + color: #555; + border: 1px solid #555; + border-radius: 2px; + width: 120px; + height: 20px; + font-style: italic; + padding: 3px; + outline: none; + font-size: 12px; +} +input[type="password"] { margin: 4px 0px 4px 0px; background-color: #eee; color: #555; - border: 1px dashed #555; + border: 1px solid #555; border-radius: 2px; width: 120px; height: 20px; @@ -77,13 +81,6 @@ td img { padding: 3px; margin: 0; } -#corrInput { - width: 580px; -} -#Rfile { - width: 200px; - height: 30px; -} button { margin: 4px 0px 4px 0px; padding-left: 3px; @@ -99,10 +96,13 @@ button { border-radius: 6px; cursor:pointer; } +button:hover { + color: #078; +} .small { font-size: 10px; } -.long { +input[type="text"].long { width: 360px; } .code { @@ -129,11 +129,15 @@ p { line-height: 160%; } #corretoR { - border: 2px dashed black; + border: 1px solid #555; border-radius: 5px; - background: #def; + background: #eef; padding: 7px; - overflow: hidden; + padding-top: 13px; + overflow-x: hidden; + overflow-y: auto; + height: 100%; + max-height: 600px; } .timepick { diff --git a/html/texto.php b/html/texto.php index d88d243..fdda2f3 100644 --- a/html/texto.php +++ b/html/texto.php @@ -2,7 +2,7 @@ require_once("head.php"); ## COMECA AQUI if (! $USER->admin()) { - echo "Acesso negado"; + echo "

Acesso negado

"; exit; } @@ -17,7 +17,7 @@ ?>

Busca em texto

Encontre o texto submetido pelos alunos para cada exercício.

- +

Escolha a turma:

Escolha um exercício:

  • Escolha um aluno para ver todas as tentativas aqui: diff --git a/html/turmas.php b/html/turmas.php index fe12cd6..de5bd4c 100644 --- a/html/turmas.php +++ b/html/turmas.php @@ -1,39 +1,40 @@ admin()) { - echo "Acesso negado"; + echo "

    Acesso negado

    "; exit; } +require('menu.php'); ?>

    Administração de turmas

    remove()) - echo "

    Turma removida

    "; + echo "

    Turma removida

    "; else - echo "

    Erro ao remover turma! Verifique se a turma tem 0 alunos

    "; + echo "

    Erro ao remover turma! Só é possível remover turmas vazias!

    "; } if(isset($_REQUEST['submit'])) { $turma = new Turma(); if ($turma->create($_REQUEST['nome'])) - echo "

    Turma criada

    "; + echo "

    Turma criada

    "; else - echo "

    Erro ao criar turma!

    "; + echo "

    Erro ao criar turma!

    "; } ?>

    Turmas cadastradas:

    "; + echo ""; } ?>
    NomeAlunosExercícios
    ".$turma->getNome()."".$turma->getAlunos()."".$turma->getNEx()."
    ".$turma->getNome()."".$turma->getAlunos()."".$turma->getNEx()."
    - -

    Criar nova turma: -
    -

    + +

     

    +

    Criar nova turma:

    +

    • diff --git a/rserve b/rserve index e05874e..e2dc58b 100755 --- a/rserve +++ b/rserve @@ -31,9 +31,9 @@ local NO_COLOUR="\033[0m" N=`ps -ef | grep Rserve | wc -l` if [ "$N" -lt 2 ]; then - echo "Rserve is ${RED}down${NO_COLOUR}."; + echo -e "Rserve is ${RED}down${NO_COLOUR}."; else - echo "Rserve is ${GREEN}up${NO_COLOUR}."; + echo -e "Rserve is ${GREEN}up${NO_COLOUR}."; fi } diff --git a/tables.sql b/tables.sql index e8ec95d..98145ad 100644 --- a/tables.sql +++ b/tables.sql @@ -77,13 +77,14 @@ CREATE TABLE proibido ( id_proibido int(10) PRIMARY KEY AUTO_INCREMENT, palavra VARCHAR(200), id_exercicio INT(10), + hard BIT(1) DEFAULT 0, INDEX (id_exercicio), FOREIGN KEY (id_exercicio) REFERENCES exercicio (id_exercicio) ) ENGINE=INNODB; -INSERT INTO proibido (palavra) VALUES ('system'),('save.image'),('file.copy'),('set.seed'),('library'), -('MySQL'),('dbApply'),('dbBuild'),('dbCall'),('dbConnect'),('dbEscape'),('dbSendQuery'), -('mysql'),('unlink'),('setwd'),('shell'),('.C'),('dyn.load'),('library.dynam'),('.External'), -('.Fortran'),('.Call'),('.Platform'),('<<-'),('set.global'),('reg.finalizer'),('on.exit'), -('assign'),('deparse'),('new.env'),('.Last'),('parse'),('eval'); +INSERT INTO proibido (palavra, hard) VALUES ('system',1),('save.image',0),('file.copy',0),('set.seed',0),('library',0), +('MySQL',1),('dbApply',1),('dbBuild',1),('dbCall',1),('dbConnect',1),('dbEscape',1),('dbSendQuery',1), +('mysql',1),('unlink',1),('setwd',1),('shell',1),('.C',1),('dyn.load',1),('library.dynam',1),('.External',1), +('.Fortran',1),('.Call',1),('.Platform',1),('<<-',1),('set.global',1),('reg.finalizer',1),('on.exit',0), +('assign',1),('deparse',1),('new.env',1),('.Last',1),('parse',1),('eval',1);