aboutsummaryrefslogtreecommitdiffstats
path: root/mayor-orig/mayor-naplo/www/skin
diff options
context:
space:
mode:
Diffstat (limited to 'mayor-orig/mayor-naplo/www/skin')
-rw-r--r--mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/naplo.jquery.min.js33
1 files changed, 21 insertions, 12 deletions
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/naplo.jquery.min.js b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/naplo.jquery.min.js
index 2337a13e..df72b0cb 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/naplo.jquery.min.js
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/naplo.jquery.min.js
@@ -713,17 +713,35 @@ processJSONOraAdat = function(adat) {
// if (adat['oraAdat']['kiCn']!='') content += '<li><span>Tanár: ' + adat['oraAdat']['kiCn'] +'</li>';
if (adat['oraAdat']['kitCn']!='') content += '<li>Helyettesítendő: ' + adat['oraAdat']['kitCn'] +'</li>';
content += '<li>Terem: ' + (adat['oraAdat']['teremId']==null?'–':adat['oraAdat']['teremId']) +'</li>';
- content += '<li>Leírás: ' + (adat['oraAdat']['leiras']) +'</li>';
+// content += '<li>Leírás: ' + (adat['oraAdat']['leiras']) +'</li>';
content += '</ul>';
- if (adat['oraBeirhato']) content += adat['oraForm'];
+ content += '<h3>Tananyag</h3>';
+ if (adat['oraBeirhato']) {
+ content += adat['oraForm'];
+ } else {
+ if (adat['oraAdat']['leiras']!=null) {
+ content += '<div style="border-left: solid 0px #888; padding: 4px; background-color:#444;">';
+ content += adat['oraAdat']['leiras'];
+ content += '</div>';
+ }
+ }
+
// content += '<h3>Óra kapcsolatai</h3>';
// content += '<ul><li>Beírt mulasztások száma: '+'n/a'+'</li>';
// content += '<li>Beírt jegyek száma: '+'n/a'+'</li>';
// content += '</ul>';
- content += '<h3>Dolgozatok</h3>';
+ content += '<h3>Házi feladat ';
+ content += '<a href="'+href({'page':'naplo','sub':'haladasi','f':'hazifeladat','oraId':adat['oraAdat']['oraId']})+'"><span class="icon-resize-full"></span></a>';
+ content += '</h3>';
+ if (adat['oraAdat']['hazifeladatId']>0) {
+ content += '<div style="border-left: solid 0px #888; padding: 4px; background-color:#444;">';
+ content += adat['oraAdat']['hazifeladatLeiras'];
+ content += '</div>';
+ }
+ content += '<h3>Dolgozatok</h3>';
if (adat['dolgozat']['dolgozatIds'].length>0) {
content += '<ul>';
for (i=0; i<adat['dolgozat'].dolgozatIds.length; i++) {
@@ -737,15 +755,6 @@ processJSONOraAdat = function(adat) {
content += adat['dolgozatForm'];
}
-
- content += '<h3>Házi feladat ';
- content += '<a href="'+href({'page':'naplo','sub':'haladasi','f':'hazifeladat','oraId':adat['oraAdat']['oraId']})+'"><span class="icon-home-alt"></span></a>';
- content += '</h3>';
- if (adat['oraAdat']['hazifeladatId']>0) {
- content += '<div style="border: solid 1px #999">';
- content += adat['oraAdat']['hazifeladatLeiras'];
- content += '</div>';
- }
if (adat['elozoOrak']!=undefined && adat['elozoOrak'].length>0) {
content += '<h3>Előző órák</h3>';
content += '<ul>';