2018-07-03 állapot

7 files changed, 43 insertions, 30 deletions

diff --git a/mayor-orig/www/skin/classic/module-naplo/css/haladasi/haladasi.css b/mayor-orig/www/skin/classic/module-naplo/css/haladasi/haladasi.css
index c2862fe8..4eae0808 100644
--- a/mayor-orig/www/skin/classic/module-naplo/css/haladasi/haladasi.css
+++ b/mayor-orig/www/skin/classic/module-naplo/css/haladasi/haladasi.css
@@ -2,16 +2,21 @@
 
 	table.haladasiBejegyzesek {
     	    background-color: rgb(50,60,80);
+	    background: linear-gradient( rgb(50,60,80), white);
 	    margin-top: 10px;
-	    font-size: 11px;
+	    /* font-size: 11px; */
 	    width: 98%;
 	}
-	table.haladasiBejegyzesek thead tr th {height:18px;}
+	table.haladasiBejegyzesek thead tr th, table.haladasiBejegyzesek tfoot tr th {height:18px; font-weight: normal;}
 	table.haladasiBejegyzesek thead tr th span.aktiv {
 	    position:relative; top:-5px; padding-left:5px;
-	    color: orange;
+	    /*color: orange;*/
+	}
+
+	table.haladasiBejegyzesek tbody tr:first-child th { border-top:solid 16px white; }
+	table.haladasiBejegyzesek tbody:hover tr:first-child th { background-color: orange; 
+	    transition: all ease 0.1s;
 	}
-	
 	table.haladasiBejegyzesek tbody tr td {height:18px;}
 	table.haladasiBejegyzesek tbody tr:hover td { background-color: rgba(255,255,255,0.2); }
 	table.haladasiBejegyzesek tbody tr td input:focus {
@@ -40,6 +45,9 @@
 	table.haladasiBejegyzesek tbody td.t {
 	    padding-left:4px;
 	}
+	table.haladasiBejegyzesek tbody tr th.nap span.napNev {
+	    background-color:white; border-radius: 2px; color: #444;padding: 0px 4px;
+	}
 
 	/* ajax eredménye */
 	table.haladasiBejegyzesek tbody tr.elmarad td {
@@ -106,10 +114,10 @@
 
 	table.haladasiBejegyzesek td.osztaly { text-align: center; }
 	table.haladasiBejegyzesek select {
-	    font-size: 10px;
+	    /* font-size: 10px; */
 	}
 
-	input { font-family: Verdana,Arial; color: inherit; }
+	input { color: inherit; outline: none;}
 	input.data { border-style: none none solid none;
 			 border-width: 1px;
 			 border-color: #dddddd;
@@ -118,6 +126,9 @@
 	}
 	input.data:hover { border-bottom: solid 1px #556677; background-color: white }
 
+	table.haladasiBejegyzesek tbody tr td.ora {text-align:center;}
+	table.haladasiBejegyzesek tbody tr td div.oraTime {font-size:xx-small; display: block; padding-left:4px; color:#888;}
+
 	table.haladasiBejegyzesek span.INFO { display: none; width:1em; padding:2px 2px; position: relative; left:-12px; border-radius:2px;color: white;}
 	table.haladasiBejegyzesek input.ajaxRequestDone+span.INFO { display: inline; background-color: green; }
 	table.haladasiBejegyzesek input.ajaxRequest+span.INFO { display: inline; background-color: orange; }
@@ -150,7 +161,8 @@
 	table.haladasiBejegyzesek tbody tr.egyeb.órarend { background-color: #aaaacc; }
 
 	input.gomb {
-		font-size: xx-small; border: solid 1px #777777; 
+		font-size: xx-small;
+		border: solid 1px #777777; 
 		padding: 0px 1px; margin: 0px;
 		background-color: #009900;
 		color: white;
@@ -165,7 +177,7 @@
 	table.haladasiBejegyzesek a.gomb {
 		padding: 1px;
 		background-color: #dddddd;
-		font-size: 10px;
+		/* font-size: 10px; */
 		border: outset 1px #556677; 
 		margin: 2px;
 		text-decoration: none;
@@ -173,7 +185,7 @@
 	table.haladasiBejegyzesek a.gomb:hover  {
 		padding: 1px;
 		background-color: #556677;
-		font-size: 10px;
+		/* font-size: 10px; */
 		border: outset 1px #dddddd; 
 		margin: 2px;
 		text-decoration: none;
@@ -233,7 +245,7 @@
 	form.hetes input { color: black; border: none; margin: 4px; border: solid 1px #008800; }
 	form.hetes span { padding-right:2em; }
 	form.hetes select option {
-	    font-size:small;
+	    /* font-size:small; */
 	    background-color:# white;
 	    border: solix 1px #00aa00;
 	}
@@ -242,7 +254,7 @@
     table.haladasiNaplo {
     	    background-color: rgb(50,60,80);
 	    width: 98%;
-	    font-size: 11px;
+	    /* font-size: 11px; */
     }	
     table.haladasiNaplo thead tr th{
     	    background-color: rgb(50,60,80);
@@ -250,10 +262,6 @@
 	    border-bottom: solid 1px white;
 	    height:1.5em;
     }	
-    table.haladasiNaplo tfoot tr th{
-	    font-size: 10px;
-	    color: white;
-    }	
     table.haladasiNaplo tr td{ padding:0.6em; background-color: #eee; }
 
     #updateWindow { width: 80%; top: 10%; margin-top: auto; margin-bottom: auto; height: 80%; left: 50%; margin-left: -40%; }
@@ -282,7 +290,7 @@
 	border: none 0px;
     }
 
-    table.haladasiBejegyzesek button.gomb { font-size:8px; padding:4px;}
+    table.haladasiBejegyzesek button.gomb { /*font-size:8px;*/ padding:4px;}
 
     table.haladasiBejegyzesek tbody tr td.ora a.tankorStat {display:none;}
     table.haladasiBejegyzesek tbody tr:hover td.ora a.tankorStat { display:inline;}
diff --git a/mayor-orig/www/skin/classic/module-naplo/css/hianyzas/nap.css b/mayor-orig/www/skin/classic/module-naplo/css/hianyzas/nap.css
index a3ed6c1e..ce5a989d 100644
--- a/mayor-orig/www/skin/classic/module-naplo/css/hianyzas/nap.css
+++ b/mayor-orig/www/skin/classic/module-naplo/css/hianyzas/nap.css
@@ -1,3 +1,4 @@
+@charset "utf-8";
 
     table.csoportNevsorHianyzok {
 	background-color: #eeeeee;
@@ -70,6 +71,9 @@
         border-width: 0px 1px 3px 1px;
         border-style: solid;
     }
+    .hianyzas.checked, .hiányzás.checked {
+	background-color: darkred;
+    }
 
     .keses, .késés {
         border-color: rgb(200,200,100);
diff --git a/mayor-orig/www/skin/classic/module-naplo/css/hianyzas/ora.css b/mayor-orig/www/skin/classic/module-naplo/css/hianyzas/ora.css
index 6eee317a..e739bc04 100644
--- a/mayor-orig/www/skin/classic/module-naplo/css/hianyzas/ora.css
+++ b/mayor-orig/www/skin/classic/module-naplo/css/hianyzas/ora.css
@@ -1,3 +1,4 @@
+@charset "utf-8";
 
     table.csoportNevsorHianyzok { background-color: #eeeeee; color: white; }
 
@@ -65,7 +66,9 @@
         border-width: 0px 1px 3px 1px;
         border-style: solid;
     }
-
+    .hianyzas.checked, .hiányzás.checked {
+        background-color: darkred;
+    }
     .keses, .késés {
 /*	width:12px;*/
         border-color: rgb(200,200,100);
diff --git a/mayor-orig/www/skin/classic/module-naplo/css/hibabejelento/hibabejelento.css b/mayor-orig/www/skin/classic/module-naplo/css/hibabejelento/hibabejelento.css
index c767a75d..833b24b6 100644
--- a/mayor-orig/www/skin/classic/module-naplo/css/hibabejelento/hibabejelento.css
+++ b/mayor-orig/www/skin/classic/module-naplo/css/hibabejelento/hibabejelento.css
@@ -1,6 +1,6 @@
 
     form.hiba {
-	background-color: rgb(20,120,140);
+	background-color: cornflowerblue;
 	margin-left: 10%;
 	margin-right: 10%;
 	padding-left: 0px;
@@ -13,14 +13,6 @@
     }
 
     form.hiba h1 { font-size: 14pt; border-bottom: solid 2px rgb(100,200,160); border-width: 2px 0px; background-color: rgb(20,40,60); margin: 4px 0px; padding: 3px}
-    form.hiba textarea { font-size: 14px; background-color: rgb(250,250,250); width: 99%; height: 100px; border: solid 1px black; padding:2px;}
-
-    form.hiba input,
-    form.hiba select {
-	margin:2px 10px;
-	background-color: cyan;
-	border: solid 1px rgb(120,220,240);
-	padding:0px 10px;
-    }
+    form.hiba textarea { font-size: 14px; background-color: white; width: 99%; height: 100px; border: solid 1px black; padding:2px;}
 
 
diff --git a/mayor-orig/www/skin/classic/module-naplo/css/intezmeny/osztaly.css b/mayor-orig/www/skin/classic/module-naplo/css/intezmeny/osztaly.css
index a61f7c44..c13d310c 100644
--- a/mayor-orig/www/skin/classic/module-naplo/css/intezmeny/osztaly.css
+++ b/mayor-orig/www/skin/classic/module-naplo/css/intezmeny/osztaly.css
@@ -55,3 +55,6 @@
     form.osztalyForm span.data { margin: 20px; background-color: white; color: black; padding: 5px; font-size: 12px; font-weight: bold; }
     form.osztalyForm ol li span.diakNev { padding-left:0.5em; cursor:pointer; }
     form.osztalyForm ol li span.datumok { color: #888; padding-left:1em; }
+
+    span.diakNaploSorszam { padding-left:4px; padding-right:4px; background-color: cornflowerblue; color:white; border-radius: 2px; margin: 0px 4px;}
+    span.diakJogviszony { padding-left:4px; padding-right:4px; background-color: orange; color:white; border-radius: 2px; margin: 0px 4px;}
diff --git a/mayor-orig/www/skin/classic/module-naplo/css/naplo.css b/mayor-orig/www/skin/classic/module-naplo/css/naplo.css
index 0585e4cd..ddf0da7d 100644
--- a/mayor-orig/www/skin/classic/module-naplo/css/naplo.css
+++ b/mayor-orig/www/skin/classic/module-naplo/css/naplo.css
@@ -26,7 +26,7 @@
 
 
     table.toolBar { width: 95%; max-width: 95%;	border-spacing: 0px; margin: 1em auto; overflow: auto; border-collapse: collapse;}
-    table.toolBar tr.first td.toolBarTitle { border: solid 1px #333333; }
+    table.toolBar tr.first td.toolBarTitle { border-bottom: solid 1px #333; padding-left:4px; }
     table.toolBar tr.first td.toolBarTool { border-style: solid; border-width: 1px 1px 1px 1px; border-color: #333333; }
 
     table.toolBar form { margin: 0px; padding: 0px;}
@@ -42,7 +42,7 @@
 	font-weight: 600;
 	letter-spacing: 0.2px;
 	border-color: rgb(21,71,123);
-	border-width: 1px 0px 1px 1px;
+	border-width: 1px 1px 1px 1px;
 	border-style: solid;
     }
     table.toolBar th button.toolBarClear { float:right; border: none; background-color: #5A85B8; height:10px;font-size:9px; color:inherit; padding:0px 2px; color: rgba(255,255,255,0.5);}
@@ -59,6 +59,8 @@
 
 
 /* TD */
+    table.toolBar td {padding: 0px;}
+    table.toolBar td form td {padding: 1px;}
     table.toolBar td.gap { width: 50%; border-spacing: 0px; }
     table.toolBar td.help {
 	background-color: rgb(11,51,103);
@@ -203,7 +205,7 @@
 
 /*    #updateWindowSide h3:before { font-family: 'Elusive-Icons'; font-size:10px; content: "\e0a4"; padding-right:8px;font-weight:100; }*/
 
-    .updateWindowSide button.mentes,    .updateWindowSide button.torles  { margin: 4px 18px; height:2em; border-radius:2px; border: solid 1px white; color:white;}
+    .updateWindowSide button.mentes,    .updateWindowSide button.torles  { margin: 4px 18px; height:2em; border-radius:2px; border: solid 1px white; color:white; background-color: #ddd;}
     .updateWindowSide button.mentes:hover { background-color: lightgreen; }
     .updateWindowSide button.torles:hover { background-color: red; }
 
diff --git a/mayor-orig/www/skin/classic/module-naplo/css/orarend/orarend.css b/mayor-orig/www/skin/classic/module-naplo/css/orarend/orarend.css
index f6bab505..4acdd988 100644
--- a/mayor-orig/www/skin/classic/module-naplo/css/orarend/orarend.css
+++ b/mayor-orig/www/skin/classic/module-naplo/css/orarend/orarend.css
@@ -93,6 +93,7 @@ table.orarend tbody tr td div.jegyzet.mase.publikus2 { background-color: #4caf50
 
 table.orarend tbody tr.orarendJegyzetSor th { background-color: orange; border-color: orange; font-weight:normal; font-size: x-small; cursor: pointer}
 table.orarend tbody tr.orarendJegyzetSor td.jegyzetContainer { background-color: cornflowerblue; }
+table.orarend tbody tr.orarendJegyzetSor td.jegyzetContainer div:hover { border-color: #bbb;   transition : border 50ms ease-out;}
 
 table.orarend tr td {
     text-align: center;