Rev: 4627rev4627

15 files changed, 47 insertions, 38 deletions

diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev
index e2f5cf77..cebe3996 100644
--- a/mayor-orig/mayor-base/log/mayor-base.rev
+++ b/mayor-orig/mayor-base/log/mayor-base.rev
@@ -1 +1 @@
-4626
+4627
diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
index e2f5cf77..cebe3996 100644
--- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
+++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
@@ -1 +1 @@
-4626
+4627
diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
index e2f5cf77..cebe3996 100644
--- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
+++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
@@ -1 +1 @@
-4626
+4627
diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
index e2f5cf77..cebe3996 100644
--- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
+++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
@@ -1 +1 @@
-4626
+4627
diff --git a/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev b/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev
index e2f5cf77..cebe3996 100644
--- a/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev
+++ b/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev
@@ -1 +1 @@
-4626
+4627
diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
index e2f5cf77..cebe3996 100644
--- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev
+++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
@@ -1 +1 @@
-4626
+4627
diff --git a/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev b/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev
index e2f5cf77..cebe3996 100644
--- a/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev
+++ b/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev
@@ -1 +1 @@
-4626
+4627
diff --git a/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev b/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev
index e2f5cf77..cebe3996 100644
--- a/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev
+++ b/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev
@@ -1 +1 @@
-4626
+4627
diff --git a/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev b/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev
index e2f5cf77..cebe3996 100644
--- a/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev
+++ b/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev
@@ -1 +1 @@
-4626
+4627
diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
index e2f5cf77..cebe3996 100644
--- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev
+++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
@@ -1 +1 @@
-4626
+4627
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>';
diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev
index e2f5cf77..cebe3996 100644
--- a/mayor-orig/mayor-portal/log/mayor-portal.rev
+++ b/mayor-orig/mayor-portal/log/mayor-portal.rev
@@ -1 +1 @@
-4626
+4627
diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
index e2f5cf77..cebe3996 100644
--- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev
+++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
@@ -1 +1 @@
-4626
+4627
diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum
index 86b84dc4..79c42a37 100644
--- a/mayor-orig/md5sum
+++ b/mayor-orig/md5sum
@@ -1,13 +1,13 @@
-Revision 4626
-bbab926daed50990fa04c1b7e5b8b5c6  mayor-fenntarto-rev4626.tgz
-bf007ee1d205f5c1f3baf5d8a6de0bb9  mayor-installer-sulix-rev4626.tgz
-3eb46f321213c547655bd6e8a0e7990a  mayor-wiki-rev4626.tgz
-22f12ae76468a5d91fa079c5b7283977  mayor-installer-rev4626.tgz
-5c9e2dcbc2ad2b114af8e88f5824dd53  mayor-portal-rev4626.tgz
-dea2c36014a4bda87380221eb684277f  mayor-felveteli-rev4626.tgz
-e0994630eca8a487ad6e8ee93e4c13ff  mayor-jatek-rev4626.tgz
-cd4a330f4d26a4f130bc4dde2fe569d2  mayor-locales-jp_JP-rev4626.tgz
-e9125161f16cc3881d5e258bf2ceb9cb  mayor-locales-de_DE-rev4626.tgz
-e1f0a8a41de5daa57116977bc2eca026  mayor-locales-en_US-rev4626.tgz
-0e5231e6991eadb50d81c9bf683ebaea  mayor-naplo-rev4626.tgz
-6df276d3d8bced4ed4b9a5e71b6a3c4d  mayor-base-rev4626.tgz
+Revision 4627
+9238ae5ec1a8ceaa1b9f4470a2200a65  mayor-fenntarto-rev4627.tgz
+0ec69bb6b5dea12c123db0470d0eada6  mayor-installer-sulix-rev4627.tgz
+f8f94be20577d8ad99646b9d2e54be1c  mayor-wiki-rev4627.tgz
+c203cd02037be0403e001107771c3811  mayor-installer-rev4627.tgz
+75ff155715b4c3028a548f83d125744b  mayor-portal-rev4627.tgz
+1dda11ba92cee4031346e61c10cad98a  mayor-felveteli-rev4627.tgz
+8515bf9c07f1895a0c5fad6a456b0b0c  mayor-jatek-rev4627.tgz
+a80484858d800c4245714bdc7b4763aa  mayor-locales-jp_JP-rev4627.tgz
+4f2a739b44a9db7e56e4d79e6ca740f0  mayor-locales-de_DE-rev4627.tgz
+44d9657452937c8f129a18a56db1ef1f  mayor-locales-en_US-rev4627.tgz
+1cce7c9ee390e62d4f4eacd276e4d866  mayor-naplo-rev4627.tgz
+7305eb9d83b3233de7c9ac255c68df17  mayor-base-rev4627.tgz
diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt
index e2f5cf77..cebe3996 100644
--- a/mayor-orig/rev.txt
+++ b/mayor-orig/rev.txt
@@ -1 +1 @@
-4626
+4627