changed version to 0.7.2

warning: 'Winix::FileLog::init' hides overloaded virtual function [-Woverloaded-virtual]

.gitignore

@@ -0,0 +1,6 @@
+.cproject
+.project
+.settings/
+*.o
+*.so
+winixd/winix

winixd/Makefile

@@ -27,7 +27,7 @@ endif
 #	CXX = g++-4.8
 
 ifndef CXXFLAGS
-CXXFLAGS = -Wall -O0 -g -fPIC -pthread -std=c++17 -I/usr/local/include -I/usr/include/postgresql -DEZC_HAS_SPECIAL_STREAM
+CXXFLAGS = -Wall -O0 -g -fPIC -pthread -std=c++20 -I/usr/local/include -I/usr/include/postgresql -DEZC_HAS_SPECIAL_STREAM
 endif
 
 ifndef AR
@@ -87,6 +87,7 @@ plugins: FORCE
 	@cd plugins/menu      		; $(MAKE) -e
 	@cd plugins/export    		; $(MAKE) -e
 	@cd plugins/mailregister	; $(MAKE) -e
+	@cd plugins/seo	            ; $(MAKE) -e
 
 
 FORCE:
@@ -106,6 +107,7 @@ clean:
 	@cd plugins/menu         ; $(MAKE) -e clean
 	@cd plugins/export       ; $(MAKE) -e clean
 	@cd plugins/mailregister ; $(MAKE) -e clean
+	@cd plugins/seo          ; $(MAKE) -e clean
 	@cd $(GLOBAL_WORKING_DIR)/ezc/src           ; $(MAKE) -e clean
 	@cd $(GLOBAL_WORKING_DIR)/tito/src          ; $(MAKE) -e clean
 	@cd $(GLOBAL_WORKING_DIR)/pikotools         ; $(MAKE) -e clean
@@ -132,6 +134,7 @@ depend:
 	@cd plugins/menu         ; $(MAKE) -e depend
 	@cd plugins/export       ; $(MAKE) -e depend
 	@cd plugins/mailregister ; $(MAKE) -e depend
+	@cd plugins/seo          ; $(MAKE) -e depend
 	@cd $(GLOBAL_WORKING_DIR)/ezc/src           ; $(MAKE) -e depend
 	@cd $(GLOBAL_WORKING_DIR)/tito/src          ; $(MAKE) -e depend
 	@cd $(GLOBAL_WORKING_DIR)/pikotools         ; $(MAKE) -e depend

winixd/core/Makefile.dep

@@ -49,15 +49,16 @@ app.o: ../../../morm/src/model.h ../../../morm/src/modelconnector.h
 app.o: ../../../morm/src/clearer.h ../../../morm/src/dbconnector.h
 app.o: ../../../morm/src/queryresult.h ../../../morm/src/flatconnector.h
 app.o: ../../../morm/src/dbexpression.h ../../../morm/src/baseexpression.h
+app.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h
+app.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h
+app.o: ../../../morm/src/fieldvaluehelper.h
 app.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 app.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 app.o: ../../../morm/src/postgresqlexpression.h
-app.o: ../../../morm/src/dochtmlexpression.h
 app.o: ../../../morm/src/jsonconnector.h
 app.o: ../../../morm/src/postgresqlconnector.h
-app.o: ../../../morm/src/postgresqlqueryresult.h
-app.o: ../../../morm/src/dochtmlconnector.h ipbancontainer.h lastcontainer.h
-app.o: system.h job.h basethread.h dirs.h dircontainer.h
+app.o: ../../../morm/src/postgresqlqueryresult.h ipbancontainer.h
+app.o: lastcontainer.h system.h job.h basethread.h dirs.h dircontainer.h
 app.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h
 app.o: ../../../winix/winixd/db/dbconn.h
 app.o: ../../../winix/winixd/db/dbtextstream.h
@@ -170,15 +171,17 @@ basethread.o: ../../../morm/src/clearer.h ../../../morm/src/dbconnector.h
 basethread.o: ../../../morm/src/queryresult.h
 basethread.o: ../../../morm/src/flatconnector.h
 basethread.o: ../../../morm/src/dbexpression.h
-basethread.o: ../../../morm/src/baseexpression.h
+basethread.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+basethread.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+basethread.o: ../../../morm/src/finderhelper.h
+basethread.o: ../../../morm/src/fieldvaluehelper.h
 basethread.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
-basethread.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
+basethread.o: ../../../pikotools/utf8/utf8.h ../../../morm/src/cursor.h
+basethread.o: ../../../morm/src/jsonexpression.h
 basethread.o: ../../../morm/src/postgresqlexpression.h
-basethread.o: ../../../morm/src/dochtmlexpression.h
 basethread.o: ../../../morm/src/jsonconnector.h
 basethread.o: ../../../morm/src/postgresqlconnector.h
 basethread.o: ../../../morm/src/postgresqlqueryresult.h
-basethread.o: ../../../morm/src/dochtmlconnector.h
 bbcodeparser.o: bbcodeparser.h htmlfilter.h
 bbcodeparser.o: ../../../winix/winixd/core/winixbase.h
 compress.o: compress.h requesttypes.h
@@ -285,14 +288,15 @@ dirs.o: ../../../morm/src/model.h ../../../morm/src/modelconnector.h
 dirs.o: ../../../morm/src/clearer.h ../../../morm/src/dbconnector.h
 dirs.o: ../../../morm/src/queryresult.h ../../../morm/src/flatconnector.h
 dirs.o: ../../../morm/src/dbexpression.h ../../../morm/src/baseexpression.h
+dirs.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h
+dirs.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h
+dirs.o: ../../../morm/src/fieldvaluehelper.h
 dirs.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 dirs.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 dirs.o: ../../../morm/src/postgresqlexpression.h
-dirs.o: ../../../morm/src/dochtmlexpression.h
 dirs.o: ../../../morm/src/jsonconnector.h
 dirs.o: ../../../morm/src/postgresqlconnector.h
 dirs.o: ../../../morm/src/postgresqlqueryresult.h
-dirs.o: ../../../morm/src/dochtmlconnector.h
 dirs.o: ../../../winix/winixd/notify/notify.h
 dirs.o: ../../../winix/winixd/notify/notifypool.h
 dirs.o: ../../../winix/winixd/templates/locale.h
@@ -355,15 +359,17 @@ groups.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 groups.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 groups.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 groups.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-groups.o: ../../../morm/src/baseexpression.h
+groups.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+groups.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+groups.o: ../../../morm/src/finderhelper.h
+groups.o: ../../../morm/src/fieldvaluehelper.h
 groups.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
-groups.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
+groups.o: ../../../pikotools/utf8/utf8.h ../../../morm/src/cursor.h
+groups.o: ../../../morm/src/jsonexpression.h
 groups.o: ../../../morm/src/postgresqlexpression.h
-groups.o: ../../../morm/src/dochtmlexpression.h
 groups.o: ../../../morm/src/jsonconnector.h
 groups.o: ../../../morm/src/postgresqlconnector.h
 groups.o: ../../../morm/src/postgresqlqueryresult.h
-groups.o: ../../../morm/src/dochtmlconnector.h
 htmlfilter.o: htmlfilter.h ../../../winix/winixd/core/winixbase.h
 httpsimpleparser.o: httpsimpleparser.h winixmodel.h
 httpsimpleparser.o: ../../../winix/winixd/core/winixbase.h plugin.h
@@ -391,17 +397,21 @@ httpsimpleparser.o: ../../../morm/src/queryresult.h
 httpsimpleparser.o: ../../../morm/src/flatconnector.h
 httpsimpleparser.o: ../../../morm/src/dbexpression.h
 httpsimpleparser.o: ../../../morm/src/baseexpression.h
+httpsimpleparser.o: ../../../morm/src/modelenv.h
+httpsimpleparser.o: ../../../morm/src/modeldata.h
+httpsimpleparser.o: ../../../morm/src/cursorhelper.h
+httpsimpleparser.o: ../../../morm/src/finderhelper.h
+httpsimpleparser.o: ../../../morm/src/fieldvaluehelper.h
 httpsimpleparser.o: ../../../morm/src/flatexpression.h
-httpsimpleparser.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
+httpsimpleparser.o: ../../../morm/src/finder.h ../../../pikotools/utf8/utf8.h
+httpsimpleparser.o: ../../../morm/src/cursor.h
 httpsimpleparser.o: ../../../morm/src/jsonexpression.h
 httpsimpleparser.o: ../../../morm/src/postgresqlexpression.h
-httpsimpleparser.o: ../../../morm/src/dochtmlexpression.h
 httpsimpleparser.o: ../../../morm/src/jsonconnector.h
 httpsimpleparser.o: ../../../morm/src/postgresqlconnector.h
-httpsimpleparser.o: ../../../morm/src/postgresqlqueryresult.h
-httpsimpleparser.o: ../../../morm/src/dochtmlconnector.h misc.h item.h
-httpsimpleparser.o: requesttypes.h ../../../pikotools/utf8/utf8.h
-httpsimpleparser.o: winix_const.h ../../../pikotools/convert/convert.h
+httpsimpleparser.o: ../../../morm/src/postgresqlqueryresult.h misc.h item.h
+httpsimpleparser.o: requesttypes.h winix_const.h
+httpsimpleparser.o: ../../../pikotools/convert/convert.h
 httpsimpleparser.o: ../../../pikotools/convert/inttostr.h
 httpsimpleparser.o: ../../../pikotools/convert/patternreplacer.h
 httpsimpleparser.o: ../../../pikotools/convert/strtoint.h
@@ -425,17 +435,18 @@ image.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 image.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 image.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 image.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-image.o: ../../../morm/src/baseexpression.h
+image.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+image.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+image.o: ../../../morm/src/finderhelper.h
+image.o: ../../../morm/src/fieldvaluehelper.h
 image.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
-image.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
+image.o: ../../../pikotools/utf8/utf8.h ../../../morm/src/cursor.h
+image.o: ../../../morm/src/jsonexpression.h
 image.o: ../../../morm/src/postgresqlexpression.h
-image.o: ../../../morm/src/dochtmlexpression.h
 image.o: ../../../morm/src/jsonconnector.h
 image.o: ../../../morm/src/postgresqlconnector.h
-image.o: ../../../morm/src/postgresqlqueryresult.h
-image.o: ../../../morm/src/dochtmlconnector.h textstream.h misc.h item.h
-image.o: requesttypes.h ../../../pikotools/utf8/utf8.h winix_const.h
-image.o: ../../../pikotools/convert/convert.h
+image.o: ../../../morm/src/postgresqlqueryresult.h textstream.h misc.h item.h
+image.o: requesttypes.h winix_const.h ../../../pikotools/convert/convert.h
 image.o: ../../../pikotools/convert/inttostr.h
 image.o: ../../../pikotools/convert/patternreplacer.h
 image.o: ../../../pikotools/convert/strtoint.h
@@ -498,15 +509,18 @@ ipbancontainer.o: ../../../morm/src/queryresult.h
 ipbancontainer.o: ../../../morm/src/flatconnector.h
 ipbancontainer.o: ../../../morm/src/dbexpression.h
 ipbancontainer.o: ../../../morm/src/baseexpression.h
+ipbancontainer.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h
+ipbancontainer.o: ../../../morm/src/cursorhelper.h
+ipbancontainer.o: ../../../morm/src/finderhelper.h
+ipbancontainer.o: ../../../morm/src/fieldvaluehelper.h
 ipbancontainer.o: ../../../morm/src/flatexpression.h
-ipbancontainer.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
+ipbancontainer.o: ../../../morm/src/finder.h ../../../pikotools/utf8/utf8.h
+ipbancontainer.o: ../../../morm/src/cursor.h
 ipbancontainer.o: ../../../morm/src/jsonexpression.h
 ipbancontainer.o: ../../../morm/src/postgresqlexpression.h
-ipbancontainer.o: ../../../morm/src/dochtmlexpression.h
 ipbancontainer.o: ../../../morm/src/jsonconnector.h
 ipbancontainer.o: ../../../morm/src/postgresqlconnector.h
 ipbancontainer.o: ../../../morm/src/postgresqlqueryresult.h
-ipbancontainer.o: ../../../morm/src/dochtmlconnector.h
 item.o: item.h ../../../pikotools/space/space.h
 item.o: ../../../pikotools/date/date.h ../../../pikotools/convert/inttostr.h
 item.o: misc.h requesttypes.h ../../../pikotools/textstream/textstream.h
@@ -541,15 +555,16 @@ job.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 job.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 job.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 job.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-job.o: ../../../morm/src/baseexpression.h ../../../morm/src/flatexpression.h
-job.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
+job.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+job.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+job.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h
+job.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
+job.o: ../../../pikotools/utf8/utf8.h ../../../morm/src/cursor.h
 job.o: ../../../morm/src/jsonexpression.h
 job.o: ../../../morm/src/postgresqlexpression.h
-job.o: ../../../morm/src/dochtmlexpression.h
 job.o: ../../../morm/src/jsonconnector.h
 job.o: ../../../morm/src/postgresqlconnector.h
 job.o: ../../../morm/src/postgresqlqueryresult.h
-job.o: ../../../morm/src/dochtmlconnector.h
 lastcontainer.o: lastcontainer.h ../../../pikotools/date/date.h
 lastcontainer.o: ../../../pikotools/convert/inttostr.h winixbase.h
 lastcontainer.o: ../../../winix/winixd/core/config.h
@@ -705,14 +720,16 @@ mountparser.o: ../../../morm/src/queryresult.h
 mountparser.o: ../../../morm/src/flatconnector.h
 mountparser.o: ../../../morm/src/dbexpression.h
 mountparser.o: ../../../morm/src/baseexpression.h
+mountparser.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h
+mountparser.o: ../../../morm/src/cursorhelper.h
+mountparser.o: ../../../morm/src/finderhelper.h
+mountparser.o: ../../../morm/src/fieldvaluehelper.h
 mountparser.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 mountparser.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 mountparser.o: ../../../morm/src/postgresqlexpression.h
-mountparser.o: ../../../morm/src/dochtmlexpression.h
 mountparser.o: ../../../morm/src/jsonconnector.h
 mountparser.o: ../../../morm/src/postgresqlconnector.h
 mountparser.o: ../../../morm/src/postgresqlqueryresult.h
-mountparser.o: ../../../morm/src/dochtmlconnector.h
 mounts.o: mounts.h mount.h error.h dirs.h item.h
 mounts.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
 mounts.o: ../../../pikotools/convert/inttostr.h dircontainer.h winixbase.h
@@ -754,16 +771,17 @@ mounts.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 mounts.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 mounts.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 mounts.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-mounts.o: ../../../morm/src/baseexpression.h
+mounts.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+mounts.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+mounts.o: ../../../morm/src/finderhelper.h
+mounts.o: ../../../morm/src/fieldvaluehelper.h
 mounts.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 mounts.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 mounts.o: ../../../morm/src/postgresqlexpression.h
-mounts.o: ../../../morm/src/dochtmlexpression.h
 mounts.o: ../../../morm/src/jsonconnector.h
 mounts.o: ../../../morm/src/postgresqlconnector.h
-mounts.o: ../../../morm/src/postgresqlqueryresult.h
-mounts.o: ../../../morm/src/dochtmlconnector.h mountparser.h cur.h session.h
-mounts.o: user.h rebus.h ipban.h
+mounts.o: ../../../morm/src/postgresqlqueryresult.h mountparser.h cur.h
+mounts.o: session.h user.h rebus.h ipban.h
 plugin.o: plugin.h pluginmsg.h plugindata.h winixbase.h
 plugin.o: ../../../winix/winixd/core/config.h
 plugin.o: ../../../pikotools/space/spaceparser.h
@@ -790,14 +808,15 @@ plugin.o: ../../../morm/src/model.h ../../../morm/src/modelconnector.h
 plugin.o: ../../../morm/src/clearer.h ../../../morm/src/dbconnector.h
 plugin.o: ../../../morm/src/queryresult.h ../../../morm/src/flatconnector.h
 plugin.o: ../../../morm/src/dbexpression.h ../../../morm/src/baseexpression.h
+plugin.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h
+plugin.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h
+plugin.o: ../../../morm/src/fieldvaluehelper.h
 plugin.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 plugin.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 plugin.o: ../../../morm/src/postgresqlexpression.h
-plugin.o: ../../../morm/src/dochtmlexpression.h
 plugin.o: ../../../morm/src/jsonconnector.h
 plugin.o: ../../../morm/src/postgresqlconnector.h
-plugin.o: ../../../morm/src/postgresqlqueryresult.h
-plugin.o: ../../../morm/src/dochtmlconnector.h dirs.h dircontainer.h
+plugin.o: ../../../morm/src/postgresqlqueryresult.h dirs.h dircontainer.h
 plugin.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h
 plugin.o: ../../../winix/winixd/db/dbconn.h
 plugin.o: ../../../winix/winixd/db/dbtextstream.h
@@ -1044,15 +1063,18 @@ sessioncontainer.o: ../../../morm/src/queryresult.h
 sessioncontainer.o: ../../../morm/src/flatconnector.h
 sessioncontainer.o: ../../../morm/src/dbexpression.h
 sessioncontainer.o: ../../../morm/src/baseexpression.h
+sessioncontainer.o: ../../../morm/src/modelenv.h
+sessioncontainer.o: ../../../morm/src/modeldata.h
+sessioncontainer.o: ../../../morm/src/cursorhelper.h
+sessioncontainer.o: ../../../morm/src/finderhelper.h
+sessioncontainer.o: ../../../morm/src/fieldvaluehelper.h
 sessioncontainer.o: ../../../morm/src/flatexpression.h
 sessioncontainer.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
 sessioncontainer.o: ../../../morm/src/jsonexpression.h
 sessioncontainer.o: ../../../morm/src/postgresqlexpression.h
-sessioncontainer.o: ../../../morm/src/dochtmlexpression.h
 sessioncontainer.o: ../../../morm/src/jsonconnector.h
 sessioncontainer.o: ../../../morm/src/postgresqlconnector.h
 sessioncontainer.o: ../../../morm/src/postgresqlqueryresult.h
-sessioncontainer.o: ../../../morm/src/dochtmlconnector.h
 sessionidmanager.o: sessionidmanager.h ../../../tito/src/base64.h
 sessionidmanager.o: ../../../pikotools/space/space.h ../../../tito/src/aes.h
 sessionidmanager.o: winixbase.h ../../../winix/winixd/core/config.h
@@ -1111,15 +1133,17 @@ sessionmanager.o: ../../../morm/src/queryresult.h
 sessionmanager.o: ../../../morm/src/flatconnector.h
 sessionmanager.o: ../../../morm/src/dbexpression.h
 sessionmanager.o: ../../../morm/src/baseexpression.h
+sessionmanager.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h
+sessionmanager.o: ../../../morm/src/cursorhelper.h
+sessionmanager.o: ../../../morm/src/finderhelper.h
+sessionmanager.o: ../../../morm/src/fieldvaluehelper.h
 sessionmanager.o: ../../../morm/src/flatexpression.h
 sessionmanager.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
 sessionmanager.o: ../../../morm/src/jsonexpression.h
 sessionmanager.o: ../../../morm/src/postgresqlexpression.h
-sessionmanager.o: ../../../morm/src/dochtmlexpression.h
 sessionmanager.o: ../../../morm/src/jsonconnector.h
 sessionmanager.o: ../../../morm/src/postgresqlconnector.h
-sessionmanager.o: ../../../morm/src/postgresqlqueryresult.h
-sessionmanager.o: ../../../morm/src/dochtmlconnector.h ipbancontainer.h
+sessionmanager.o: ../../../morm/src/postgresqlqueryresult.h ipbancontainer.h
 sessionmanager.o: lastcontainer.h system.h job.h basethread.h dirs.h
 sessionmanager.o: dircontainer.h ../../../winix/winixd/db/db.h
 sessionmanager.o: ../../../winix/winixd/db/dbbase.h
@@ -1199,16 +1223,18 @@ sessionparser.o: ../../../morm/src/queryresult.h
 sessionparser.o: ../../../morm/src/flatconnector.h
 sessionparser.o: ../../../morm/src/dbexpression.h
 sessionparser.o: ../../../morm/src/baseexpression.h
+sessionparser.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h
+sessionparser.o: ../../../morm/src/cursorhelper.h
+sessionparser.o: ../../../morm/src/finderhelper.h
+sessionparser.o: ../../../morm/src/fieldvaluehelper.h
 sessionparser.o: ../../../morm/src/flatexpression.h
 sessionparser.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
 sessionparser.o: ../../../morm/src/jsonexpression.h
 sessionparser.o: ../../../morm/src/postgresqlexpression.h
-sessionparser.o: ../../../morm/src/dochtmlexpression.h
 sessionparser.o: ../../../morm/src/jsonconnector.h
 sessionparser.o: ../../../morm/src/postgresqlconnector.h
-sessionparser.o: ../../../morm/src/postgresqlqueryresult.h
-sessionparser.o: ../../../morm/src/dochtmlconnector.h users.h ugcontainer.h
-sessionparser.o: lastcontainer.h ../../../winix/winixd/db/db.h
+sessionparser.o: ../../../morm/src/postgresqlqueryresult.h users.h
+sessionparser.o: ugcontainer.h lastcontainer.h ../../../winix/winixd/db/db.h
 sessionparser.o: ../../../winix/winixd/db/dbbase.h
 sessionparser.o: ../../../winix/winixd/db/dbconn.h
 sessionparser.o: ../../../winix/winixd/db/dbtextstream.h
@@ -1267,16 +1293,18 @@ system.o: ../../../morm/src/model.h ../../../morm/src/modelconnector.h
 system.o: ../../../morm/src/clearer.h ../../../morm/src/dbconnector.h
 system.o: ../../../morm/src/queryresult.h ../../../morm/src/flatconnector.h
 system.o: ../../../morm/src/dbexpression.h ../../../morm/src/baseexpression.h
+system.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h
+system.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h
+system.o: ../../../morm/src/fieldvaluehelper.h
 system.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
-system.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
+system.o: ../../../pikotools/utf8/utf8.h ../../../morm/src/cursor.h
+system.o: ../../../morm/src/jsonexpression.h
 system.o: ../../../morm/src/postgresqlexpression.h
-system.o: ../../../morm/src/dochtmlexpression.h
 system.o: ../../../morm/src/jsonconnector.h
 system.o: ../../../morm/src/postgresqlconnector.h
-system.o: ../../../morm/src/postgresqlqueryresult.h
-system.o: ../../../morm/src/dochtmlconnector.h dirs.h item.h dircontainer.h
-system.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h
-system.o: ../../../winix/winixd/db/dbconn.h
+system.o: ../../../morm/src/postgresqlqueryresult.h dirs.h item.h
+system.o: dircontainer.h ../../../winix/winixd/db/db.h
+system.o: ../../../winix/winixd/db/dbbase.h ../../../winix/winixd/db/dbconn.h
 system.o: ../../../winix/winixd/db/dbtextstream.h
 system.o: ../../../winix/winixd/core/textstream.h
 system.o: ../../../winix/winixd/core/error.h
@@ -1287,8 +1315,8 @@ system.o: ../../../winix/winixd/core/user.h
 system.o: ../../../winix/winixd/core/group.h
 system.o: ../../../winix/winixd/core/dircontainer.h
 system.o: ../../../winix/winixd/core/ugcontainer.h request.h requesttypes.h
-system.o: error.h config.h textstream.h misc.h ../../../pikotools/utf8/utf8.h
-system.o: winix_const.h ../../../pikotools/convert/convert.h
+system.o: error.h config.h textstream.h misc.h winix_const.h
+system.o: ../../../pikotools/convert/convert.h
 system.o: ../../../pikotools/convert/inttostr.h
 system.o: ../../../pikotools/convert/patternreplacer.h
 system.o: ../../../pikotools/convert/strtoint.h
@@ -1397,15 +1425,18 @@ threadmanager.o: ../../../morm/src/queryresult.h
 threadmanager.o: ../../../morm/src/flatconnector.h
 threadmanager.o: ../../../morm/src/dbexpression.h
 threadmanager.o: ../../../morm/src/baseexpression.h
+threadmanager.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h
+threadmanager.o: ../../../morm/src/cursorhelper.h
+threadmanager.o: ../../../morm/src/finderhelper.h
+threadmanager.o: ../../../morm/src/fieldvaluehelper.h
 threadmanager.o: ../../../morm/src/flatexpression.h
-threadmanager.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
+threadmanager.o: ../../../morm/src/finder.h ../../../pikotools/utf8/utf8.h
+threadmanager.o: ../../../morm/src/cursor.h
 threadmanager.o: ../../../morm/src/jsonexpression.h
 threadmanager.o: ../../../morm/src/postgresqlexpression.h
-threadmanager.o: ../../../morm/src/dochtmlexpression.h
 threadmanager.o: ../../../morm/src/jsonconnector.h
 threadmanager.o: ../../../morm/src/postgresqlconnector.h
 threadmanager.o: ../../../morm/src/postgresqlqueryresult.h
-threadmanager.o: ../../../morm/src/dochtmlconnector.h
 timezone.o: timezone.h ../../../pikotools/date/date.h
 timezone.o: ../../../pikotools/convert/inttostr.h
 timezone.o: ../../../pikotools/space/space.h misc.h item.h requesttypes.h
@@ -1481,14 +1512,15 @@ users.o: ../../../morm/src/model.h ../../../morm/src/modelconnector.h
 users.o: ../../../morm/src/clearer.h ../../../morm/src/dbconnector.h
 users.o: ../../../morm/src/queryresult.h ../../../morm/src/flatconnector.h
 users.o: ../../../morm/src/dbexpression.h ../../../morm/src/baseexpression.h
+users.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h
+users.o: ../../../morm/src/cursorhelper.h ../../../morm/src/finderhelper.h
+users.o: ../../../morm/src/fieldvaluehelper.h
 users.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 users.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 users.o: ../../../morm/src/postgresqlexpression.h
-users.o: ../../../morm/src/dochtmlexpression.h
 users.o: ../../../morm/src/jsonconnector.h
 users.o: ../../../morm/src/postgresqlconnector.h
-users.o: ../../../morm/src/postgresqlqueryresult.h
-users.o: ../../../morm/src/dochtmlconnector.h sessionmanager.h
+users.o: ../../../morm/src/postgresqlqueryresult.h sessionmanager.h
 users.o: sessioncontainer.h ipbancontainer.h system.h job.h basethread.h
 users.o: dirs.h dircontainer.h mounts.h mountparser.h crypt.h run.h groups.h
 users.o: group.h loadavg.h image.h threadmanager.h
@@ -1545,15 +1577,17 @@ winixmodel.o: ../../../morm/src/clearer.h ../../../morm/src/dbconnector.h
 winixmodel.o: ../../../morm/src/queryresult.h
 winixmodel.o: ../../../morm/src/flatconnector.h
 winixmodel.o: ../../../morm/src/dbexpression.h
-winixmodel.o: ../../../morm/src/baseexpression.h
+winixmodel.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+winixmodel.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+winixmodel.o: ../../../morm/src/finderhelper.h
+winixmodel.o: ../../../morm/src/fieldvaluehelper.h
 winixmodel.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
-winixmodel.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
+winixmodel.o: ../../../pikotools/utf8/utf8.h ../../../morm/src/cursor.h
+winixmodel.o: ../../../morm/src/jsonexpression.h
 winixmodel.o: ../../../morm/src/postgresqlexpression.h
-winixmodel.o: ../../../morm/src/dochtmlexpression.h
 winixmodel.o: ../../../morm/src/jsonconnector.h
 winixmodel.o: ../../../morm/src/postgresqlconnector.h
 winixmodel.o: ../../../morm/src/postgresqlqueryresult.h
-winixmodel.o: ../../../morm/src/dochtmlconnector.h
 winixrequest.o: winixrequest.h
 winixsystem.o: winixsystem.h ../../../winix/winixd/core/winixmodel.h
 winixsystem.o: ../../../winix/winixd/core/system.h

winixd/core/app.cpp

@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2010-2018, Tomasz Sowa
+ * Copyright (c) 2010-2019, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -151,10 +151,8 @@ App::App()
 
 	session_manager.set_dependency(&winix_model); // zobaczyc czy wskoczy do przeciazonej metody w session manager
 	session_manager.SetLastContainer(&system.users.last);
-	session_manager.SetConfig(&config);
 	session_manager.SetCur(&cur);
 	session_manager.SetSystem(&system);
-	session_manager.SetSynchro(&synchro);
 
 	post_multi_parser.set_dependency(&winix_base);
 	post_multi_parser.SetConfig(&config);
@@ -500,10 +498,10 @@ void App::ProcessRequestThrow()
 			if( !cur.request->dir_tab.empty() )
 			{
 				cur.mount = system.mounts.CalcCurMount();
-				functions.CheckFunctionAndSymlink();
 
-				session_manager.PrepareSession();
-				cur.session = session_manager.GetCurSession();
+				cur.session = session_manager.PrepareSession();
+				functions.CheckFunctionAndSymlink(); // here a function can be changed
+				cur.session = session_manager.CheckIfFunctionRequireSession();
 				SetLocale();
 
 				if( cur.session->new_session )
@@ -567,7 +565,7 @@ void App::ProcessRequest()
 		log << log2 << config.log_delimiter << logend;
 
 		ProcessRequestThrow();
-		SaveSessionsIfNeeded(); // !! IMPROVE ME move to the session's thread
+		SaveSessionsIfNeeded();
 
 		system.load_avg.StopRequest();
 	}
@@ -1097,14 +1095,21 @@ void App::ReadPostJson()
 	}
 	while( read_len == buffer_len );
 
-	PT::JSONToSpaceParser::Status status = post_json_parser.ParseString(post_buffer.c_str());
-	post_buffer.clear();
-
-	if( status != PT::JSONToSpaceParser::ok )
+	if( !post_buffer.empty() )
 	{
-		log << log1 << "App: cannot parse the input stream as a JSON object, status: " << (int)status << logend;
-		cur.request->post_in.Clear();
-		// return an error (http error of some kind?)
+		PT::JSONToSpaceParser::Status status = post_json_parser.ParseString(post_buffer.c_str());
+		post_buffer.clear();
+
+		if( status != PT::JSONToSpaceParser::ok )
+		{
+			log << log1 << "App: cannot parse the input stream as a JSON object, status: " << (int)status << logend;
+			cur.request->post_in.Clear();
+			// return an error (http error of some kind?)
+		}
+	}
+	else
+	{
+		log << log3 << "App: input body empty (skipping parsing)" << logend;
 	}
 }
 

winixd/core/basethread.cpp

@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2010-2018, Tomasz Sowa
+ * Copyright (c) 2010-2019, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -54,13 +54,17 @@ BaseThread::~BaseThread()
 }
 
 
-
-void BaseThread::SetSynchro(Synchro * psynchro)
+void BaseThread::set_main_log_buffer(PT::WTextStream * log_buffer)
 {
-	synchro = psynchro;
+	main_log.SetLogBuffer(log_buffer);
 }
 
 
+void BaseThread::set_main_file_log(PT::FileLog * file_log)
+{
+	main_log.SetFileLog(file_log);
+}
+
 
 void BaseThread::Mode(int mode)
 {
@@ -250,6 +254,7 @@ void * BaseThread::StartRoutine(void * this_object)
 		}
 	}
 
+	base->save_log();
 	pthread_exit(0);
 	return 0;
 }

winixd/core/basethread.h

@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2010-2018, Tomasz Sowa
+ * Copyright (c) 2010-2019, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -54,8 +54,9 @@ public:
 	BaseThread();
 	virtual ~BaseThread();
 
-	// synchro object (must be set)
-	void SetSynchro(Synchro * psynchro);
+	void set_main_log_buffer(PT::WTextStream * log_buffer);
+	void set_main_file_log(PT::FileLog * file_log);
+
 
 	// work mode
 	// we have two modes:
@@ -100,6 +101,13 @@ public:
 	pthread_t ThreadId();
 
 
+protected:
+
+	// logger for the main thread
+	Log main_log;
+
+	// log from WinixBase is meant to be used by the other thread
+
 
 protected:
 
@@ -126,7 +134,6 @@ protected:
 
 protected:
 
-	Synchro * synchro;
 	pthread_t thread_id; // thread id - set by StartThread()
 	pthread_cond_t thread_signal;
 	int work_mode;

winixd/core/config.cpp

@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2008-2018, Tomasz Sowa
+ * Copyright (c) 2008-2021, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -186,6 +186,7 @@ void Config::AssignValues(bool stdout_is_closed)
 	templates_fun_prefix	= Text(L"templates_fun_prefix", L"fun_");
 	templates_fun_postfix	= Text(L"templates_fun_postfix", L".html");
 	templates_index			= Text(L"templates_index", L"index.html");
+	templates_index_generic = Text(L"templates_index_generic", L"index_generic.html");
 	templates_index_raw     = Text(L"templates_index_raw", L"index_raw.html");
 	template_only_root_use_template_fun = Bool(L"template_only_root_use_template_fun", false);
 

winixd/core/config.h

@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2008-2018, Tomasz Sowa
+ * Copyright (c) 2008-2021, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -181,6 +181,10 @@ public:
 	// default: index.html
 	std::wstring templates_index;
 
+	// html template used to send generic content - without site-css styles and markup (only uikit)
+	// default: index_generic.html
+	std::wstring templates_index_generic;
+
 	// html template used to send raw content
 	// default: index_raw.html
 	std::wstring templates_index_raw;

winixd/core/filelog.cpp

@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2018, Tomasz Sowa
+ * Copyright (c) 2018-2019, Tomasz Sowa
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -95,6 +95,7 @@ PT::Date FileLog::get_local_date(const PT::Date & date)
 {
 	if( time_zones )
 	{
+		Lock lock(synchro);
 		TimeZone * tz = time_zones->GetZone(log_time_zone_id);
 
 		if( tz )

winixd/core/filelog.h

@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2018, Tomasz Sowa
+ * Copyright (c) 2018-2021, Tomasz Sowa
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -58,6 +58,10 @@ public:
 
 	void set_synchro(Synchro * synchro);
 
+	// using PT::FileLog::init to suppress clang warning:
+	// warning: 'Winix::FileLog::init' hides overloaded virtual function [-Woverloaded-virtual]
+	using PT::FileLog::init;
+
 	void init(const std::wstring & log_file, bool log_stdout, int log_level, bool save_each_line, size_t log_time_zone_id);
 
 	void set_time_zones(TimeZones * time_zones);

winixd/core/image.cpp

@@ -581,6 +581,8 @@ void Image::CreateImage()
 				<< ", 'convert' process returned: " << res << logend;
 		}
 	}
+
+	log << logsave;
 }
 
 

winixd/core/job.cpp

@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2012-2014, Tomasz Sowa
+ * Copyright (c) 2012-2019, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -183,9 +183,7 @@ void Job::DoJob(PT::Space & job)
 // second thread (objects not locked)
 void Job::DoWinixJob(PT::Space & job)
 {
-	Lock();
 	//log << log1 << "standard winix job: " << job.Text(L"type") << logend;
-	Unlock();
 }
 
 

winixd/core/log.cpp

@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2008-2018, Tomasz Sowa
+ * Copyright (c) 2008-2019, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -77,7 +77,7 @@ void Log::PrintDate(const PT::Date & date)
 	FileLog * winix_file_log = dynamic_cast<FileLog*>(file_log);
 
 	if( winix_file_log )
-		(*this) << winix_file_log->get_local_date(date);
+		(*this) << winix_file_log->get_local_date(date); // synchronization is made in get_local_date
 	else
 		(*this) << date;
 }
@@ -250,17 +250,18 @@ return *this;
 }
 
 
-Log & Log::SystemErr(int err)
-{
-	(*this) << "errno: " << err;
-
-	const char * err_msg = strerror(err);
-
-	if( err_msg )
-		(*this) << " (" << err_msg << ")";
-
-	return *this;
-}
+//Log & Log::SystemErr(int err)
+//{
+//	(*this) << "errno: " << err;
+//
+//  // strerror is not thread safe and we now use Log in each thread
+//	const char * err_msg = strerror(err);
+//
+//	if( err_msg )
+//		(*this) << " (" << err_msg << ")";
+//
+//	return *this;
+//}
 
 
 

winixd/core/log.h

@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2008-2018, Tomasz Sowa
+ * Copyright (c) 2008-2019, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -91,7 +91,7 @@ public:
 	virtual Log & LogBinary(const char * blob, size_t blob_len);
 	virtual Log & LogBinary(const std::string & blob);
 
-	virtual Log & SystemErr(int err);
+	//virtual Log & SystemErr(int err);
 
 
 private:

winixd/core/mounts.cpp

@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2009-2018, Tomasz Sowa
+ * Copyright (c) 2009-2021, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -222,6 +222,11 @@ void Mounts::ReadMounts(const std::wstring & mounts)
 	mount_parser.Parse(mounts, mount_tab);
 
 	CalcCurMount();
+
+	// IMPROVE ME
+	// cur->mount is pointing to the empty mount (it is set in functions.cpp in CheckSpecialFile method)
+	// may would be better to call WINIX_FSTAB_CHANGED after the cur->mount is set?
+	// some plugins are using 'cur' object
 	plugin->Call((Session*)0, WINIX_FSTAB_CHANGED);
 }
 

winixd/core/request.cpp

@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2008-2015, Tomasz Sowa
+ * Copyright (c) 2008-2021, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -153,6 +153,8 @@ void Request::Clear()
 	ip = 0;
 	ip_str.clear();
 	use_200_status_for_not_found_and_permission_denied = false;
+
+	html_template.clear();
 }
 
 

winixd/core/request.h

@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2008-2018, Tomasz Sowa
+ * Copyright (c) 2008-2021, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -339,6 +339,8 @@ struct Request
 	bool gen_use_special_chars;
 
 
+	// index template name
+	std::wstring html_template;
 
 
 	/*

winixd/core/sessionmanager.cpp

@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2008-2018, Tomasz Sowa
+ * Copyright (c) 2008-2019, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -77,13 +77,6 @@ void SessionManager::SetCur(Cur * pcur)
 }
 
 
-void SessionManager::SetConfig(Config * pconfig)
-{
-	config = pconfig;
-	session_tab.SetConfig(pconfig);
-}
-
-
 void SessionManager::SetSystem(System * psystem)
 {
 	system = psystem;
@@ -195,7 +188,7 @@ SessionContainer::Iterator i = session_tab.End();
 	}
 	else
 	{
-		log << log2 << "SM: sessions limit exceeded (" << config->session_max << ")" << logend;
+		main_log << log2 << "SM: sessions limit exceeded (" << config->session_max << ")" << logend;
 	}
 
 	if( i != session_tab.End() )
@@ -206,12 +199,12 @@ SessionContainer::Iterator i = session_tab.End();
 		session->id_index = (unsigned int)session->id;
 		session->id_index += std::rand();
 
-		log << log2 << "SM: created a new session: " << session->id << logend;
+		main_log << log2 << "SM: created a new session: " << session->id << logend;
 	}
 	else
 	{
 		// there is a problem with generating a new session id
-		log << log1 << "SM: cannot create a session id" << logend;
+		main_log << log1 << "SM: cannot create a session id" << logend;
 	}
 }
 
@@ -223,7 +216,7 @@ void SessionManager::SetTemporarySession()
 	session->SetTimesTo(cur->request->start_time);
 	session->new_session = false; // temporary session was initialized at the beginning
 
-	log << log2 << "SM: using temporary session" << logend;
+	main_log << log2 << "SM: using temporary session" << logend;
 }
 
 
@@ -242,15 +235,15 @@ return difference;
 
 void SessionManager::SetSessionPutLogInfo(Session & ses, bool has_index, unsigned int difference)
 {
-	log << log2 << "SM: session: " << ses.id;
+	main_log << log2 << "SM: session: " << ses.id;
 
 	if( has_index )
-		log << ", index difference: " << (size_t)difference;
+		main_log << ", index difference: " << (size_t)difference;
 
 	if( ses.puser )
-		log << log2 << ", user: " << ses.puser->name << ", id: " << ses.puser->id;
+		main_log << log2 << ", user: " << ses.puser->name << ", id: " << ses.puser->id;
 
-	log << log2 << logend;
+	main_log << log2 << logend;
 }
 
 
@@ -264,7 +257,7 @@ void SessionManager::IncrementBanLevel(IPBan * ip_ban)
 							  cur->request->start_time + (time_t)config->ban_level_3_delay);
 
 	PT::Date date(ip_ban->expires);
-	log << log2 << "SM: this IP address has been banned to: " << date << " UTC" << logend;
+	main_log << log2 << "SM: this IP address has been banned to: " << date << " UTC" << logend;
 }
 
 
@@ -290,7 +283,7 @@ void SessionManager::BrokenCookieCheckBan()
 	}
 	else
 	{
-		log << log2 << "SM: too many incorrect encoded cookies were sent from this IP" << logend;
+		main_log << log2 << "SM: too many incorrect encoded cookies were sent from this IP" << logend;
 		IncrementBanLevel(current_ip_ban);
 	}
 }
@@ -308,14 +301,14 @@ void SessionManager::IncorrectSessionCheckBan()
 	}
 	else
 	{
-		log << log2 << "SM: too many incorrect sessions identifiers were sent from this IP" << logend;
+		main_log << log2 << "SM: too many incorrect sessions identifiers were sent from this IP" << logend;
 		IncrementBanLevel(current_ip_ban);
 	}
 }
 
 
 
-bool SessionManager::ShouldNoSessionCookieGenerateTmpSession()
+void SessionManager::NoSessionCookieWasSent()
 {
 	if( !current_ip_ban )
 		current_ip_ban = &AddIPToBanList(cur->request->ip, cur->request->start_time);
@@ -324,16 +317,13 @@ bool SessionManager::ShouldNoSessionCookieGenerateTmpSession()
 	{
 		current_ip_ban->no_session_cookie_events += 1;
 		SetFirstExpirationTime(current_ip_ban);
-		return false;
 	}
 	else
 	{
-		log << log2 << "SM: too many times you have not sent a session cookie" << logend;
+		main_log << log2 << "SM: too many times you have not sent a session cookie" << logend;
 
 		if( config->no_session_cookie_ban_mode == 1 )
 			IncrementBanLevel(current_ip_ban);
-
-		return true;
 	}
 }
 
@@ -346,21 +336,21 @@ bool SessionManager::IsSessionCorrect(long id, bool has_index, unsigned int inde
 
 	if( id == 0 )
 	{
-		log << log3 << "SM: id 0 is reserved for the temporary session" << logend;
+		main_log << log3 << "SM: id 0 is reserved for the temporary session" << logend;
 		IncorrectSessionCheckBan();
 		return false;
 	}
 
 	if( s == session_tab.End() )
 	{
-		log << log3 << "SM: there is no a session with id: " << id << logend;
+		main_log << log3 << "SM: there is no a session with id: " << id << logend;
 		IncorrectSessionCheckBan();
 		return false;
 	}
 
 	if( s->remove_me )
 	{
-		log << log3 << "SM: session: " << id << " is marked for removing" << logend;
+		main_log << log3 << "SM: session: " << id << " is marked for removing" << logend;
 		return false;
 	}
 	
@@ -370,7 +360,7 @@ bool SessionManager::IsSessionCorrect(long id, bool has_index, unsigned int inde
 
 		if( (size_t)difference > config->session_allow_index_difference )
 		{
-			log << log2 << "SM: an incorrect session index for session: " << id
+			main_log << log2 << "SM: an incorrect session index for session: " << id
 				<< ", index difference: " << (size_t)difference << logend;
 
 			IncorrectSessionCheckBan();
@@ -423,7 +413,7 @@ bool SessionManager::SetSessionFromCookie(const std::wstring & cookie)
 
 		if( !session_id_manager.DecodeToken(cookie, id, index) )
 		{
-			log << log2 << "SM: an incorrect cookie string was sent" << logend;
+			main_log << log2 << "SM: an incorrect cookie string was sent" << logend;
 			BrokenCookieCheckBan();
 			return false;
 		}
@@ -448,14 +438,14 @@ bool SessionManager::IsIPBanned()
 
 		if( current_ip_ban->expires != 0 && cur->request->start_time >= current_ip_ban->expires )
 		{
-			log << log2 << "SM: resetting events counters for this IP" << logend;
+			main_log << log2 << "SM: resetting events counters for this IP" << logend;
 			current_ip_ban->ResetEventsCounters();
 		}
 		else
 		if( current_ip_ban->IsIPBanned() )
 		{
 			PT::Date date = current_ip_ban->expires;
-			log << log2 << "SM: this ip is bannned to: " << date << " UTC" << logend;
+			main_log << log2 << "SM: this ip is bannned to: " << date << " UTC" << logend;
 			return true;
 		}
 	}
@@ -480,11 +470,11 @@ return false;
  * so we always have a session
  *
  */
-void SessionManager::PrepareSession()
+Session * SessionManager::PrepareSession()
 {
 	session = nullptr;
 
-	if( !IsIPBanned() && cur->request->function )
+	if( !IsIPBanned() )
 	{
 		CookieTab::iterator i = cur->request->cookie_tab.find(config->http_session_id_name);
 
@@ -493,39 +483,54 @@ void SessionManager::PrepareSession()
 			if( !SetSessionFromCookie(i->second) )
 			{
 				cur->request->cookie_tab.erase(i);
-
-				if( cur->request->function->need_session )
-				{
-					// IP could be banned in SetSessionFromCookie() when the cookie string was incorrect
-					if( !current_ip_ban || !current_ip_ban->IsIPBanned() )
-					{
-						CreateSession();
-					}
-				}
 			}
 		}
 		else
 		{
-			if( cur->request->function->need_session )
+			if( cur->request->function && cur->request->function->need_session )
 			{
-				if( !ShouldNoSessionCookieGenerateTmpSession() )
-				{
-					CreateSession();
-				}
+				NoSessionCookieWasSent();
 			}
 		}
 	}
 
+	if( !session && cur->request->function && cur->request->function->need_session )
+	{
+		if( !current_ip_ban || !current_ip_ban->IsIPBanned() )
+		{
+			CreateSession();
+		}
+	}
+
 	if( !session )
 	{
 		SetTemporarySession();
 	}
 
 	session->ip_ban = current_ip_ban;
+	return session;
 }
 
 
 
+Session * SessionManager::CheckIfFunctionRequireSession()
+{
+	if( cur->request->function && cur->request->function->need_session )
+	{
+		if( session == &temporary_session )
+		{
+			if( !current_ip_ban || !current_ip_ban->IsIPBanned() )
+			{
+				CreateSession();
+				session->ip_ban = current_ip_ban;
+			}
+		}
+	}
+
+	return session;
+}
+
+
 Session * SessionManager::FindSession(long id)
 {
 	SessionContainer::Iterator i = session_tab.FindById(id);
@@ -596,11 +601,11 @@ SessionContainer::Iterator i = session_tab.FindById(old_id);
 		if( changed )
 			plugin->Call(&(*i), WINIX_SESSION_CHANGED_ID, old_id, new_id);
 		else
-			log << log1 << "SM: I cannot create a new session id (still uses old one)" << logend;
+			main_log << log1 << "SM: I cannot create a new session id (still uses old one)" << logend;
 	}
 	else
 	{
-		log << log2 << "SM: there is no a session with id: " << old_id << logend;
+		main_log << log2 << "SM: there is no a session with id: " << old_id << logend;
 	}
 
 return changed;
@@ -611,7 +616,7 @@ void SessionManager::InitTmpSession()
 {
 	Session * old_session = cur->session;
 
-	log << log4 << "SM: initializing temporary session" << logend;
+	main_log << log4 << "SM: initializing temporary session" << logend;
 	cur->session = &temporary_session;
 	plugin->Call(WINIX_SESSION_CREATED);
 
@@ -624,7 +629,7 @@ void SessionManager::UninitTmpSession()
 {
 	Session * old_session = cur->session;
 
-	log << log4 << "SM: uninitializing temporary session" << logend;
+	main_log << log4 << "SM: uninitializing temporary session" << logend;
 	cur->session = &temporary_session;
 
 
@@ -690,11 +695,11 @@ char file_path[WINIX_OS_PATH_SIZE];
 
 	if( !file )
 	{
-		log << log1 << "SM: cannot open the session file for writing - sessions lost" << logend;
+		main_log << log1 << "SM: cannot open the session file for writing - sessions lost" << logend;
 		return;
 	}
 
-	log << log2 << "SM: saving sessions" << logend;
+	main_log << log2 << "SM: saving sessions" << logend;
 	long len = 0;
 
 	SessionContainer::Iterator i = session_tab.Begin();
@@ -714,7 +719,7 @@ char file_path[WINIX_OS_PATH_SIZE];
 	file.close();
 	chmod(file_path, 0600);
 
-	log << log2 << "SM: saved " << len << " session(s)" << logend;
+	main_log << log2 << "SM: saved " << len << " session(s)" << logend;
 }
 
 

winixd/core/sessionmanager.h

@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2008-2018, Tomasz Sowa
+ * Copyright (c) 2008-2019, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -62,7 +62,6 @@ public:
 	SessionManager();
 
 	void SetCur(Cur * pcur);
-	void SetConfig(Config * pconfig);
 	void SetSystem(System * psystem);
 	void SetLastContainer(LastContainer * plast_container);
 
@@ -71,7 +70,12 @@ public:
 	// can return a null pointer
 	Session * FindSession(long id);
 
-	void PrepareSession();
+	Session * PrepareSession();
+
+	// some functions require a session (need_session flag) so if there was
+	// a temporary session and a function requires a session then we create a new session
+	Session * CheckIfFunctionRequireSession();
+
 	void DeleteSessions(); // deleting all sessions
 	bool ChangeSessionId(long old_id);
 
@@ -108,7 +112,6 @@ public:
 
 private:
 
-	Config  * config;
 	Cur     * cur;
 	System  * system;
 	LastContainer * last_container;
@@ -133,7 +136,7 @@ private:
 	void SetFirstExpirationTime(IPBan * ip_ban);
 	void BrokenCookieCheckBan();
 	void IncorrectSessionCheckBan();
-	bool ShouldNoSessionCookieGenerateTmpSession();
+	void NoSessionCookieWasSent();
 
 
 	/*

winixd/core/threadmanager.cpp

@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2011-2018, Tomasz Sowa
+ * Copyright (c) 2011-2019, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -72,27 +72,31 @@ sigset_t set;
 
 void ThreadManager::Add(BaseThread * pbase, const wchar_t * thread_name)
 {
-ThreadItem item;
+	thread_tab.emplace_back();
+	ThreadItem & item = thread_tab.back();
+	item.thread_item_data = new ThreadItemData();
+	ThreadItemData & data = *item.thread_item_data;
 
 	item.object = pbase;
 	item.name   = thread_name;
+	item.object->set_dependency(this);
 
-	thread_tab.push_back(item);
-	thread_tab.back().thread_item_data = new ThreadItemData();
-	thread_tab.back().object->set_dependency(this);
+	// main log buffer (from the main thread)
+	item.object->set_main_log_buffer(log.GetLogBuffer());
+	item.object->set_main_file_log(log.GetFileLog());
 
 	// the logger buffer and model_connector are different
-	ThreadItemData & data = *thread_tab.back().thread_item_data;
-	thread_tab.back().object->set_log_buffer(&data.log_buffer);
+	item.object->set_log_buffer(&data.log_buffer);
 
 	//data.postgresql_connector.set_logger(logger);
 	data.postgresql_connector.set_conn_param(config->db_database, config->db_user, config->db_pass);
-	data.postgresql_connector.set_logger(thread_tab.back().object->get_logger());
+	data.postgresql_connector.set_logger(item.object->get_logger());
 	data.postgresql_connector.set_log_queries(config->log_db_query);
 	data.postgresql_connector.wait_for_connection();
 	data.model_connector.set_db_connector(data.postgresql_connector);
 	data.model_connector.set_flat_connector(data.json_connector);
-	thread_tab.back().object->set_model_connector(&data.model_connector);
+
+	item.object->set_model_connector(&data.model_connector);
 
 	if( were_started )
 	{
@@ -144,8 +148,6 @@ void ThreadManager::StartAll()
 
 void ThreadManager::Start(int id, ThreadItem * item)
 {
-	item->object->SetSynchro(synchro);
-
 	if( item->object->StartThread() )
 	{
 		log << log4 << "TM: thread " << id << " (" << item->object->ThreadId() << ", name: "
@@ -184,6 +186,10 @@ void ThreadManager::StopAll()
 		item.object->WaitForThread();
 		log << log4 << "TM: thread " << id << " terminated" << logend;
 
+		// the thread is stopped and we can set the thread log buffer pointing to
+		// the main log buffer (from the main thread)
+		item.object->set_log_buffer(log.GetLogBuffer());
+
 		delete item.thread_item_data;
 		id += 1;
 	}

winixd/core/timezone.cpp

@@ -259,7 +259,7 @@ bool TimeZone::SetTzDst(PT::Space & year)
 
 	int year_int = Toi(year.name);
 
-	if( year_int < 1970 && year_int > 10000 )
+	if( year_int < 1970 || year_int > 10000 )
 		return false;
 
 	dst.has_dst = year.Bool(L"has_dst", false);

winixd/core/version.h

@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2008-2018, Tomasz Sowa
+ * Copyright (c) 2008-2021, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -42,7 +42,7 @@ namespace Winix
 
 #define WINIX_VER_MAJOR		0
 #define WINIX_VER_MINOR		7
-#define WINIX_VER_REVISION	0
+#define WINIX_VER_REVISION	2
 
 
 

winixd/core/winixbase.cpp

@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2018, Tomasz Sowa
+ * Copyright (c) 2018-2021, Tomasz Sowa
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -90,6 +90,13 @@ void WinixBase::set_dependency(WinixBase * winix_base)
 
 
 
+void WinixBase::save_log()
+{
+	log << logsave;
+}
+
+
+
 }
 
 

winixd/core/winixbase.h

@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2018, Tomasz Sowa
+ * Copyright (c) 2018-2021, Tomasz Sowa
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -65,6 +65,8 @@ public:
 
 	void set_dependency(WinixBase * winix_base);
 
+	void save_log();
+
 
 protected:
 

winixd/core/winixrequest.cpp

@@ -94,11 +94,9 @@ void WinixRequest::set_dependency(WinixSystem * winix_system)
 void WinixRequest::set_dependency(WinixRequest * winix_request)
 {
 	WinixSystem::set_dependency(winix_request);
-	cur = winix_request->cur;
-	locale = winix_request->locale;
-	session_manager = winix_request->session_manager;
-
-	// CHECK ME what about slog
+	set_cur(winix_request->cur);
+	set_locale(winix_request->locale);
+	set_session_manager(winix_request->session_manager);
 }
 
 

winixd/functions/Makefile.dep

@@ -58,15 +58,16 @@ account.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 account.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 account.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 account.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-account.o: ../../../morm/src/baseexpression.h
+account.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+account.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+account.o: ../../../morm/src/finderhelper.h
+account.o: ../../../morm/src/fieldvaluehelper.h
 account.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 account.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 account.o: ../../../morm/src/postgresqlexpression.h
-account.o: ../../../morm/src/dochtmlexpression.h
 account.o: ../../../morm/src/jsonconnector.h
 account.o: ../../../morm/src/postgresqlconnector.h
 account.o: ../../../morm/src/postgresqlqueryresult.h
-account.o: ../../../morm/src/dochtmlconnector.h
 account.o: ../../../winix/winixd/core/dirs.h
 account.o: ../../../winix/winixd/core/dircontainer.h
 account.o: ../../../winix/winixd/core/request.h
@@ -177,15 +178,16 @@ adduser.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 adduser.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 adduser.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 adduser.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-adduser.o: ../../../morm/src/baseexpression.h
+adduser.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+adduser.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+adduser.o: ../../../morm/src/finderhelper.h
+adduser.o: ../../../morm/src/fieldvaluehelper.h
 adduser.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 adduser.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 adduser.o: ../../../morm/src/postgresqlexpression.h
-adduser.o: ../../../morm/src/dochtmlexpression.h
 adduser.o: ../../../morm/src/jsonconnector.h
 adduser.o: ../../../morm/src/postgresqlconnector.h
 adduser.o: ../../../morm/src/postgresqlqueryresult.h
-adduser.o: ../../../morm/src/dochtmlconnector.h
 adduser.o: ../../../winix/winixd/core/dirs.h
 adduser.o: ../../../winix/winixd/core/dircontainer.h
 adduser.o: ../../../winix/winixd/core/request.h
@@ -287,15 +289,16 @@ cat.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 cat.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 cat.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 cat.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-cat.o: ../../../morm/src/baseexpression.h ../../../morm/src/flatexpression.h
-cat.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
-cat.o: ../../../morm/src/jsonexpression.h
+cat.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+cat.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+cat.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h
+cat.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
+cat.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 cat.o: ../../../morm/src/postgresqlexpression.h
-cat.o: ../../../morm/src/dochtmlexpression.h
 cat.o: ../../../morm/src/jsonconnector.h
 cat.o: ../../../morm/src/postgresqlconnector.h
 cat.o: ../../../morm/src/postgresqlqueryresult.h
-cat.o: ../../../morm/src/dochtmlconnector.h ../../../winix/winixd/core/dirs.h
+cat.o: ../../../winix/winixd/core/dirs.h
 cat.o: ../../../winix/winixd/core/dircontainer.h
 cat.o: ../../../winix/winixd/core/request.h
 cat.o: ../../../winix/winixd/core/mounts.h mount.h
@@ -394,15 +397,16 @@ chmod.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 chmod.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 chmod.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 chmod.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-chmod.o: ../../../morm/src/baseexpression.h
+chmod.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+chmod.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+chmod.o: ../../../morm/src/finderhelper.h
+chmod.o: ../../../morm/src/fieldvaluehelper.h
 chmod.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 chmod.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 chmod.o: ../../../morm/src/postgresqlexpression.h
-chmod.o: ../../../morm/src/dochtmlexpression.h
 chmod.o: ../../../morm/src/jsonconnector.h
 chmod.o: ../../../morm/src/postgresqlconnector.h
 chmod.o: ../../../morm/src/postgresqlqueryresult.h
-chmod.o: ../../../morm/src/dochtmlconnector.h
 chmod.o: ../../../winix/winixd/core/dirs.h
 chmod.o: ../../../winix/winixd/core/dircontainer.h
 chmod.o: ../../../winix/winixd/core/request.h
@@ -504,15 +508,16 @@ chown.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 chown.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 chown.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 chown.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-chown.o: ../../../morm/src/baseexpression.h
+chown.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+chown.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+chown.o: ../../../morm/src/finderhelper.h
+chown.o: ../../../morm/src/fieldvaluehelper.h
 chown.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 chown.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 chown.o: ../../../morm/src/postgresqlexpression.h
-chown.o: ../../../morm/src/dochtmlexpression.h
 chown.o: ../../../morm/src/jsonconnector.h
 chown.o: ../../../morm/src/postgresqlconnector.h
 chown.o: ../../../morm/src/postgresqlqueryresult.h
-chown.o: ../../../morm/src/dochtmlconnector.h
 chown.o: ../../../winix/winixd/core/dirs.h
 chown.o: ../../../winix/winixd/core/dircontainer.h
 chown.o: ../../../winix/winixd/core/request.h
@@ -621,15 +626,16 @@ ckeditor.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 ckeditor.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 ckeditor.o: ../../../morm/src/flatconnector.h
 ckeditor.o: ../../../morm/src/dbexpression.h
-ckeditor.o: ../../../morm/src/baseexpression.h
+ckeditor.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+ckeditor.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+ckeditor.o: ../../../morm/src/finderhelper.h
+ckeditor.o: ../../../morm/src/fieldvaluehelper.h
 ckeditor.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 ckeditor.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 ckeditor.o: ../../../morm/src/postgresqlexpression.h
-ckeditor.o: ../../../morm/src/dochtmlexpression.h
 ckeditor.o: ../../../morm/src/jsonconnector.h
 ckeditor.o: ../../../morm/src/postgresqlconnector.h
 ckeditor.o: ../../../morm/src/postgresqlqueryresult.h
-ckeditor.o: ../../../morm/src/dochtmlconnector.h
 ckeditor.o: ../../../winix/winixd/core/dirs.h
 ckeditor.o: ../../../winix/winixd/core/dircontainer.h
 ckeditor.o: ../../../winix/winixd/core/request.h
@@ -727,14 +733,16 @@ cp.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 cp.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 cp.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 cp.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-cp.o: ../../../morm/src/baseexpression.h ../../../morm/src/flatexpression.h
-cp.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
-cp.o: ../../../morm/src/jsonexpression.h
+cp.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+cp.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+cp.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h
+cp.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
+cp.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 cp.o: ../../../morm/src/postgresqlexpression.h
-cp.o: ../../../morm/src/dochtmlexpression.h ../../../morm/src/jsonconnector.h
+cp.o: ../../../morm/src/jsonconnector.h
 cp.o: ../../../morm/src/postgresqlconnector.h
 cp.o: ../../../morm/src/postgresqlqueryresult.h
-cp.o: ../../../morm/src/dochtmlconnector.h ../../../winix/winixd/core/dirs.h
+cp.o: ../../../winix/winixd/core/dirs.h
 cp.o: ../../../winix/winixd/core/dircontainer.h
 cp.o: ../../../winix/winixd/core/request.h
 cp.o: ../../../winix/winixd/core/mounts.h mount.h
@@ -839,15 +847,16 @@ default.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 default.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 default.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 default.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-default.o: ../../../morm/src/baseexpression.h
+default.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+default.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+default.o: ../../../morm/src/finderhelper.h
+default.o: ../../../morm/src/fieldvaluehelper.h
 default.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 default.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 default.o: ../../../morm/src/postgresqlexpression.h
-default.o: ../../../morm/src/dochtmlexpression.h
 default.o: ../../../morm/src/jsonconnector.h
 default.o: ../../../morm/src/postgresqlconnector.h
 default.o: ../../../morm/src/postgresqlqueryresult.h
-default.o: ../../../morm/src/dochtmlconnector.h
 default.o: ../../../winix/winixd/core/dirs.h
 default.o: ../../../winix/winixd/core/dircontainer.h
 default.o: ../../../winix/winixd/core/request.h
@@ -957,15 +966,16 @@ download.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 download.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 download.o: ../../../morm/src/flatconnector.h
 download.o: ../../../morm/src/dbexpression.h
-download.o: ../../../morm/src/baseexpression.h
+download.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+download.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+download.o: ../../../morm/src/finderhelper.h
+download.o: ../../../morm/src/fieldvaluehelper.h
 download.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 download.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 download.o: ../../../morm/src/postgresqlexpression.h
-download.o: ../../../morm/src/dochtmlexpression.h
 download.o: ../../../morm/src/jsonconnector.h
 download.o: ../../../morm/src/postgresqlconnector.h
 download.o: ../../../morm/src/postgresqlqueryresult.h
-download.o: ../../../morm/src/dochtmlconnector.h
 download.o: ../../../winix/winixd/core/dirs.h
 download.o: ../../../winix/winixd/core/dircontainer.h
 download.o: ../../../winix/winixd/core/request.h
@@ -1068,15 +1078,16 @@ emacs.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 emacs.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 emacs.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 emacs.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-emacs.o: ../../../morm/src/baseexpression.h
+emacs.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+emacs.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+emacs.o: ../../../morm/src/finderhelper.h
+emacs.o: ../../../morm/src/fieldvaluehelper.h
 emacs.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 emacs.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 emacs.o: ../../../morm/src/postgresqlexpression.h
-emacs.o: ../../../morm/src/dochtmlexpression.h
 emacs.o: ../../../morm/src/jsonconnector.h
 emacs.o: ../../../morm/src/postgresqlconnector.h
 emacs.o: ../../../morm/src/postgresqlqueryresult.h
-emacs.o: ../../../morm/src/dochtmlconnector.h
 emacs.o: ../../../winix/winixd/core/dirs.h
 emacs.o: ../../../winix/winixd/core/dircontainer.h
 emacs.o: ../../../winix/winixd/core/request.h
@@ -1181,15 +1192,16 @@ env.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 env.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 env.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 env.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-env.o: ../../../morm/src/baseexpression.h ../../../morm/src/flatexpression.h
-env.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
-env.o: ../../../morm/src/jsonexpression.h
+env.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+env.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+env.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h
+env.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
+env.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 env.o: ../../../morm/src/postgresqlexpression.h
-env.o: ../../../morm/src/dochtmlexpression.h
 env.o: ../../../morm/src/jsonconnector.h
 env.o: ../../../morm/src/postgresqlconnector.h
 env.o: ../../../morm/src/postgresqlqueryresult.h
-env.o: ../../../morm/src/dochtmlconnector.h ../../../winix/winixd/core/dirs.h
+env.o: ../../../winix/winixd/core/dirs.h
 env.o: ../../../winix/winixd/core/dircontainer.h
 env.o: ../../../winix/winixd/core/request.h
 env.o: ../../../winix/winixd/core/mounts.h mount.h
@@ -1300,14 +1312,16 @@ functionbase.o: ../../../morm/src/queryresult.h
 functionbase.o: ../../../morm/src/flatconnector.h
 functionbase.o: ../../../morm/src/dbexpression.h
 functionbase.o: ../../../morm/src/baseexpression.h
+functionbase.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h
+functionbase.o: ../../../morm/src/cursorhelper.h
+functionbase.o: ../../../morm/src/finderhelper.h
+functionbase.o: ../../../morm/src/fieldvaluehelper.h
 functionbase.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 functionbase.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 functionbase.o: ../../../morm/src/postgresqlexpression.h
-functionbase.o: ../../../morm/src/dochtmlexpression.h
 functionbase.o: ../../../morm/src/jsonconnector.h
 functionbase.o: ../../../morm/src/postgresqlconnector.h
 functionbase.o: ../../../morm/src/postgresqlqueryresult.h
-functionbase.o: ../../../morm/src/dochtmlconnector.h
 functionbase.o: ../../../winix/winixd/core/dirs.h
 functionbase.o: ../../../winix/winixd/core/dircontainer.h
 functionbase.o: ../../../winix/winixd/core/request.h
@@ -1420,15 +1434,17 @@ functionparser.o: ../../../morm/src/queryresult.h
 functionparser.o: ../../../morm/src/flatconnector.h
 functionparser.o: ../../../morm/src/dbexpression.h
 functionparser.o: ../../../morm/src/baseexpression.h
+functionparser.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h
+functionparser.o: ../../../morm/src/cursorhelper.h
+functionparser.o: ../../../morm/src/finderhelper.h
+functionparser.o: ../../../morm/src/fieldvaluehelper.h
 functionparser.o: ../../../morm/src/flatexpression.h
 functionparser.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
 functionparser.o: ../../../morm/src/jsonexpression.h
 functionparser.o: ../../../morm/src/postgresqlexpression.h
-functionparser.o: ../../../morm/src/dochtmlexpression.h
 functionparser.o: ../../../morm/src/jsonconnector.h
 functionparser.o: ../../../morm/src/postgresqlconnector.h
 functionparser.o: ../../../morm/src/postgresqlqueryresult.h
-functionparser.o: ../../../morm/src/dochtmlconnector.h
 functionparser.o: ../../../winix/winixd/core/dirs.h
 functionparser.o: ../../../winix/winixd/core/dircontainer.h
 functionparser.o: ../../../winix/winixd/core/request.h
@@ -1548,15 +1564,16 @@ functions.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 functions.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 functions.o: ../../../morm/src/flatconnector.h
 functions.o: ../../../morm/src/dbexpression.h
-functions.o: ../../../morm/src/baseexpression.h
+functions.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+functions.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+functions.o: ../../../morm/src/finderhelper.h
+functions.o: ../../../morm/src/fieldvaluehelper.h
 functions.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 functions.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 functions.o: ../../../morm/src/postgresqlexpression.h
-functions.o: ../../../morm/src/dochtmlexpression.h
 functions.o: ../../../morm/src/jsonconnector.h
 functions.o: ../../../morm/src/postgresqlconnector.h
 functions.o: ../../../morm/src/postgresqlqueryresult.h
-functions.o: ../../../morm/src/dochtmlconnector.h
 functions.o: ../../../winix/winixd/core/dirs.h
 functions.o: ../../../winix/winixd/core/dircontainer.h
 functions.o: ../../../winix/winixd/core/request.h
@@ -1674,15 +1691,16 @@ imgcrop.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 imgcrop.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 imgcrop.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 imgcrop.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-imgcrop.o: ../../../morm/src/baseexpression.h
+imgcrop.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+imgcrop.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+imgcrop.o: ../../../morm/src/finderhelper.h
+imgcrop.o: ../../../morm/src/fieldvaluehelper.h
 imgcrop.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 imgcrop.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 imgcrop.o: ../../../morm/src/postgresqlexpression.h
-imgcrop.o: ../../../morm/src/dochtmlexpression.h
 imgcrop.o: ../../../morm/src/jsonconnector.h
 imgcrop.o: ../../../morm/src/postgresqlconnector.h
 imgcrop.o: ../../../morm/src/postgresqlqueryresult.h
-imgcrop.o: ../../../morm/src/dochtmlconnector.h
 imgcrop.o: ../../../winix/winixd/core/dirs.h
 imgcrop.o: ../../../winix/winixd/core/dircontainer.h
 imgcrop.o: ../../../winix/winixd/core/request.h
@@ -1785,15 +1803,16 @@ ipban.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 ipban.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 ipban.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 ipban.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-ipban.o: ../../../morm/src/baseexpression.h
+ipban.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+ipban.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+ipban.o: ../../../morm/src/finderhelper.h
+ipban.o: ../../../morm/src/fieldvaluehelper.h
 ipban.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 ipban.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 ipban.o: ../../../morm/src/postgresqlexpression.h
-ipban.o: ../../../morm/src/dochtmlexpression.h
 ipban.o: ../../../morm/src/jsonconnector.h
 ipban.o: ../../../morm/src/postgresqlconnector.h
 ipban.o: ../../../morm/src/postgresqlqueryresult.h
-ipban.o: ../../../morm/src/dochtmlconnector.h
 ipban.o: ../../../winix/winixd/core/dirs.h
 ipban.o: ../../../winix/winixd/core/dircontainer.h
 ipban.o: ../../../winix/winixd/core/request.h
@@ -1894,15 +1913,15 @@ last.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 last.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 last.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 last.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-last.o: ../../../morm/src/baseexpression.h ../../../morm/src/flatexpression.h
-last.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
-last.o: ../../../morm/src/jsonexpression.h
+last.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+last.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+last.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h
+last.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
+last.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 last.o: ../../../morm/src/postgresqlexpression.h
-last.o: ../../../morm/src/dochtmlexpression.h
 last.o: ../../../morm/src/jsonconnector.h
 last.o: ../../../morm/src/postgresqlconnector.h
 last.o: ../../../morm/src/postgresqlqueryresult.h
-last.o: ../../../morm/src/dochtmlconnector.h
 last.o: ../../../winix/winixd/core/dirs.h
 last.o: ../../../winix/winixd/core/dircontainer.h
 last.o: ../../../winix/winixd/core/request.h
@@ -1998,14 +2017,16 @@ ln.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 ln.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 ln.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 ln.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-ln.o: ../../../morm/src/baseexpression.h ../../../morm/src/flatexpression.h
-ln.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
-ln.o: ../../../morm/src/jsonexpression.h
+ln.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+ln.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+ln.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h
+ln.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
+ln.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 ln.o: ../../../morm/src/postgresqlexpression.h
-ln.o: ../../../morm/src/dochtmlexpression.h ../../../morm/src/jsonconnector.h
+ln.o: ../../../morm/src/jsonconnector.h
 ln.o: ../../../morm/src/postgresqlconnector.h
 ln.o: ../../../morm/src/postgresqlqueryresult.h
-ln.o: ../../../morm/src/dochtmlconnector.h ../../../winix/winixd/core/dirs.h
+ln.o: ../../../winix/winixd/core/dirs.h
 ln.o: ../../../winix/winixd/core/dircontainer.h
 ln.o: ../../../winix/winixd/core/request.h
 ln.o: ../../../winix/winixd/core/mounts.h mount.h
@@ -2109,15 +2130,16 @@ locale.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 locale.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 locale.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 locale.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-locale.o: ../../../morm/src/baseexpression.h
+locale.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+locale.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+locale.o: ../../../morm/src/finderhelper.h
+locale.o: ../../../morm/src/fieldvaluehelper.h
 locale.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 locale.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 locale.o: ../../../morm/src/postgresqlexpression.h
-locale.o: ../../../morm/src/dochtmlexpression.h
 locale.o: ../../../morm/src/jsonconnector.h
 locale.o: ../../../morm/src/postgresqlconnector.h
 locale.o: ../../../morm/src/postgresqlqueryresult.h
-locale.o: ../../../morm/src/dochtmlconnector.h
 locale.o: ../../../winix/winixd/core/dirs.h
 locale.o: ../../../winix/winixd/core/dircontainer.h
 locale.o: ../../../winix/winixd/core/request.h
@@ -2231,15 +2253,16 @@ login.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 login.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 login.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 login.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-login.o: ../../../morm/src/baseexpression.h
+login.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+login.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+login.o: ../../../morm/src/finderhelper.h
+login.o: ../../../morm/src/fieldvaluehelper.h
 login.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 login.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 login.o: ../../../morm/src/postgresqlexpression.h
-login.o: ../../../morm/src/dochtmlexpression.h
 login.o: ../../../morm/src/jsonconnector.h
 login.o: ../../../morm/src/postgresqlconnector.h
 login.o: ../../../morm/src/postgresqlqueryresult.h
-login.o: ../../../morm/src/dochtmlconnector.h
 login.o: ../../../winix/winixd/core/dirs.h
 login.o: ../../../winix/winixd/core/dircontainer.h
 login.o: ../../../winix/winixd/core/request.h
@@ -2340,15 +2363,16 @@ logout.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 logout.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 logout.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 logout.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-logout.o: ../../../morm/src/baseexpression.h
+logout.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+logout.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+logout.o: ../../../morm/src/finderhelper.h
+logout.o: ../../../morm/src/fieldvaluehelper.h
 logout.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 logout.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 logout.o: ../../../morm/src/postgresqlexpression.h
-logout.o: ../../../morm/src/dochtmlexpression.h
 logout.o: ../../../morm/src/jsonconnector.h
 logout.o: ../../../morm/src/postgresqlconnector.h
 logout.o: ../../../morm/src/postgresqlqueryresult.h
-logout.o: ../../../morm/src/dochtmlconnector.h
 logout.o: ../../../winix/winixd/core/dirs.h
 logout.o: ../../../winix/winixd/core/dircontainer.h
 logout.o: ../../../winix/winixd/core/request.h
@@ -2446,14 +2470,16 @@ ls.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 ls.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 ls.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 ls.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-ls.o: ../../../morm/src/baseexpression.h ../../../morm/src/flatexpression.h
-ls.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
-ls.o: ../../../morm/src/jsonexpression.h
+ls.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+ls.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+ls.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h
+ls.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
+ls.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 ls.o: ../../../morm/src/postgresqlexpression.h
-ls.o: ../../../morm/src/dochtmlexpression.h ../../../morm/src/jsonconnector.h
+ls.o: ../../../morm/src/jsonconnector.h
 ls.o: ../../../morm/src/postgresqlconnector.h
 ls.o: ../../../morm/src/postgresqlqueryresult.h
-ls.o: ../../../morm/src/dochtmlconnector.h ../../../winix/winixd/core/dirs.h
+ls.o: ../../../winix/winixd/core/dirs.h
 ls.o: ../../../winix/winixd/core/dircontainer.h
 ls.o: ../../../winix/winixd/core/request.h
 ls.o: ../../../winix/winixd/core/mounts.h mount.h
@@ -2548,15 +2574,16 @@ man.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 man.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 man.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 man.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-man.o: ../../../morm/src/baseexpression.h ../../../morm/src/flatexpression.h
-man.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
-man.o: ../../../morm/src/jsonexpression.h
+man.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+man.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+man.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h
+man.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
+man.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 man.o: ../../../morm/src/postgresqlexpression.h
-man.o: ../../../morm/src/dochtmlexpression.h
 man.o: ../../../morm/src/jsonconnector.h
 man.o: ../../../morm/src/postgresqlconnector.h
 man.o: ../../../morm/src/postgresqlqueryresult.h
-man.o: ../../../morm/src/dochtmlconnector.h ../../../winix/winixd/core/dirs.h
+man.o: ../../../winix/winixd/core/dirs.h
 man.o: ../../../winix/winixd/core/dircontainer.h
 man.o: ../../../winix/winixd/core/request.h
 man.o: ../../../winix/winixd/core/mounts.h mount.h
@@ -2654,15 +2681,15 @@ meta.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 meta.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 meta.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 meta.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-meta.o: ../../../morm/src/baseexpression.h ../../../morm/src/flatexpression.h
-meta.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
-meta.o: ../../../morm/src/jsonexpression.h
+meta.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+meta.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+meta.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h
+meta.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
+meta.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 meta.o: ../../../morm/src/postgresqlexpression.h
-meta.o: ../../../morm/src/dochtmlexpression.h
 meta.o: ../../../morm/src/jsonconnector.h
 meta.o: ../../../morm/src/postgresqlconnector.h
 meta.o: ../../../morm/src/postgresqlqueryresult.h
-meta.o: ../../../morm/src/dochtmlconnector.h
 meta.o: ../../../winix/winixd/core/dirs.h
 meta.o: ../../../winix/winixd/core/dircontainer.h
 meta.o: ../../../winix/winixd/core/request.h
@@ -2763,15 +2790,16 @@ mkdir.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 mkdir.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 mkdir.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 mkdir.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-mkdir.o: ../../../morm/src/baseexpression.h
+mkdir.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+mkdir.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+mkdir.o: ../../../morm/src/finderhelper.h
+mkdir.o: ../../../morm/src/fieldvaluehelper.h
 mkdir.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 mkdir.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 mkdir.o: ../../../morm/src/postgresqlexpression.h
-mkdir.o: ../../../morm/src/dochtmlexpression.h
 mkdir.o: ../../../morm/src/jsonconnector.h
 mkdir.o: ../../../morm/src/postgresqlconnector.h
 mkdir.o: ../../../morm/src/postgresqlqueryresult.h
-mkdir.o: ../../../morm/src/dochtmlconnector.h
 mkdir.o: ../../../winix/winixd/core/dirs.h
 mkdir.o: ../../../winix/winixd/core/dircontainer.h
 mkdir.o: ../../../winix/winixd/core/request.h
@@ -2873,15 +2901,16 @@ mount.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 mount.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 mount.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 mount.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-mount.o: ../../../morm/src/baseexpression.h
+mount.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+mount.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+mount.o: ../../../morm/src/finderhelper.h
+mount.o: ../../../morm/src/fieldvaluehelper.h
 mount.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 mount.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 mount.o: ../../../morm/src/postgresqlexpression.h
-mount.o: ../../../morm/src/dochtmlexpression.h
 mount.o: ../../../morm/src/jsonconnector.h
 mount.o: ../../../morm/src/postgresqlconnector.h
 mount.o: ../../../morm/src/postgresqlqueryresult.h
-mount.o: ../../../morm/src/dochtmlconnector.h
 mount.o: ../../../winix/winixd/core/dirs.h
 mount.o: ../../../winix/winixd/core/dircontainer.h
 mount.o: ../../../winix/winixd/core/request.h
@@ -2978,14 +3007,16 @@ mv.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 mv.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 mv.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 mv.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-mv.o: ../../../morm/src/baseexpression.h ../../../morm/src/flatexpression.h
-mv.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
-mv.o: ../../../morm/src/jsonexpression.h
+mv.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+mv.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+mv.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h
+mv.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
+mv.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 mv.o: ../../../morm/src/postgresqlexpression.h
-mv.o: ../../../morm/src/dochtmlexpression.h ../../../morm/src/jsonconnector.h
+mv.o: ../../../morm/src/jsonconnector.h
 mv.o: ../../../morm/src/postgresqlconnector.h
 mv.o: ../../../morm/src/postgresqlqueryresult.h
-mv.o: ../../../morm/src/dochtmlconnector.h ../../../winix/winixd/core/dirs.h
+mv.o: ../../../winix/winixd/core/dirs.h
 mv.o: ../../../winix/winixd/core/dircontainer.h
 mv.o: ../../../winix/winixd/core/request.h
 mv.o: ../../../winix/winixd/core/mounts.h mount.h
@@ -3089,15 +3120,16 @@ nicedit.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 nicedit.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 nicedit.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 nicedit.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-nicedit.o: ../../../morm/src/baseexpression.h
+nicedit.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+nicedit.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+nicedit.o: ../../../morm/src/finderhelper.h
+nicedit.o: ../../../morm/src/fieldvaluehelper.h
 nicedit.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 nicedit.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 nicedit.o: ../../../morm/src/postgresqlexpression.h
-nicedit.o: ../../../morm/src/dochtmlexpression.h
 nicedit.o: ../../../morm/src/jsonconnector.h
 nicedit.o: ../../../morm/src/postgresqlconnector.h
 nicedit.o: ../../../morm/src/postgresqlqueryresult.h
-nicedit.o: ../../../morm/src/dochtmlconnector.h
 nicedit.o: ../../../winix/winixd/core/dirs.h
 nicedit.o: ../../../winix/winixd/core/dircontainer.h
 nicedit.o: ../../../winix/winixd/core/request.h
@@ -3199,15 +3231,15 @@ node.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 node.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 node.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 node.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-node.o: ../../../morm/src/baseexpression.h ../../../morm/src/flatexpression.h
-node.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
-node.o: ../../../morm/src/jsonexpression.h
+node.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+node.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+node.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h
+node.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
+node.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 node.o: ../../../morm/src/postgresqlexpression.h
-node.o: ../../../morm/src/dochtmlexpression.h
 node.o: ../../../morm/src/jsonconnector.h
 node.o: ../../../morm/src/postgresqlconnector.h
 node.o: ../../../morm/src/postgresqlqueryresult.h
-node.o: ../../../morm/src/dochtmlconnector.h
 node.o: ../../../winix/winixd/core/dirs.h
 node.o: ../../../winix/winixd/core/dircontainer.h
 node.o: ../../../winix/winixd/core/request.h
@@ -3312,15 +3344,16 @@ passwd.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 passwd.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 passwd.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 passwd.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-passwd.o: ../../../morm/src/baseexpression.h
+passwd.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+passwd.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+passwd.o: ../../../morm/src/finderhelper.h
+passwd.o: ../../../morm/src/fieldvaluehelper.h
 passwd.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 passwd.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 passwd.o: ../../../morm/src/postgresqlexpression.h
-passwd.o: ../../../morm/src/dochtmlexpression.h
 passwd.o: ../../../morm/src/jsonconnector.h
 passwd.o: ../../../morm/src/postgresqlconnector.h
 passwd.o: ../../../morm/src/postgresqlqueryresult.h
-passwd.o: ../../../morm/src/dochtmlconnector.h
 passwd.o: ../../../winix/winixd/core/dirs.h
 passwd.o: ../../../winix/winixd/core/dircontainer.h
 passwd.o: ../../../winix/winixd/core/request.h
@@ -3423,15 +3456,15 @@ priv.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 priv.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 priv.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 priv.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-priv.o: ../../../morm/src/baseexpression.h ../../../morm/src/flatexpression.h
-priv.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
-priv.o: ../../../morm/src/jsonexpression.h
+priv.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+priv.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+priv.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h
+priv.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
+priv.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 priv.o: ../../../morm/src/postgresqlexpression.h
-priv.o: ../../../morm/src/dochtmlexpression.h
 priv.o: ../../../morm/src/jsonconnector.h
 priv.o: ../../../morm/src/postgresqlconnector.h
 priv.o: ../../../morm/src/postgresqlqueryresult.h
-priv.o: ../../../morm/src/dochtmlconnector.h
 priv.o: ../../../winix/winixd/core/dirs.h
 priv.o: ../../../winix/winixd/core/dircontainer.h
 priv.o: ../../../winix/winixd/core/request.h
@@ -3531,14 +3564,16 @@ privchanger.o: ../../../morm/src/queryresult.h
 privchanger.o: ../../../morm/src/flatconnector.h
 privchanger.o: ../../../morm/src/dbexpression.h
 privchanger.o: ../../../morm/src/baseexpression.h
+privchanger.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h
+privchanger.o: ../../../morm/src/cursorhelper.h
+privchanger.o: ../../../morm/src/finderhelper.h
+privchanger.o: ../../../morm/src/fieldvaluehelper.h
 privchanger.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 privchanger.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 privchanger.o: ../../../morm/src/postgresqlexpression.h
-privchanger.o: ../../../morm/src/dochtmlexpression.h
 privchanger.o: ../../../morm/src/jsonconnector.h
 privchanger.o: ../../../morm/src/postgresqlconnector.h
 privchanger.o: ../../../morm/src/postgresqlqueryresult.h
-privchanger.o: ../../../morm/src/dochtmlconnector.h
 privchanger.o: ../../../winix/winixd/core/dirs.h
 privchanger.o: ../../../winix/winixd/core/dircontainer.h
 privchanger.o: ../../../winix/winixd/db/db.h
@@ -3649,14 +3684,16 @@ pw.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 pw.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 pw.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 pw.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-pw.o: ../../../morm/src/baseexpression.h ../../../morm/src/flatexpression.h
-pw.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
-pw.o: ../../../morm/src/jsonexpression.h
+pw.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+pw.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+pw.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h
+pw.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
+pw.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 pw.o: ../../../morm/src/postgresqlexpression.h
-pw.o: ../../../morm/src/dochtmlexpression.h ../../../morm/src/jsonconnector.h
+pw.o: ../../../morm/src/jsonconnector.h
 pw.o: ../../../morm/src/postgresqlconnector.h
 pw.o: ../../../morm/src/postgresqlqueryresult.h
-pw.o: ../../../morm/src/dochtmlconnector.h ../../../winix/winixd/core/dirs.h
+pw.o: ../../../winix/winixd/core/dirs.h
 pw.o: ../../../winix/winixd/core/dircontainer.h
 pw.o: ../../../winix/winixd/core/request.h
 pw.o: ../../../winix/winixd/core/mounts.h mount.h
@@ -3759,15 +3796,16 @@ reload.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 reload.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 reload.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 reload.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-reload.o: ../../../morm/src/baseexpression.h
+reload.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+reload.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+reload.o: ../../../morm/src/finderhelper.h
+reload.o: ../../../morm/src/fieldvaluehelper.h
 reload.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 reload.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 reload.o: ../../../morm/src/postgresqlexpression.h
-reload.o: ../../../morm/src/dochtmlexpression.h
 reload.o: ../../../morm/src/jsonconnector.h
 reload.o: ../../../morm/src/postgresqlconnector.h
 reload.o: ../../../morm/src/postgresqlqueryresult.h
-reload.o: ../../../morm/src/dochtmlconnector.h
 reload.o: ../../../winix/winixd/core/dirs.h
 reload.o: ../../../winix/winixd/core/dircontainer.h
 reload.o: ../../../winix/winixd/core/request.h
@@ -3871,14 +3909,16 @@ rm.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 rm.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 rm.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 rm.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-rm.o: ../../../morm/src/baseexpression.h ../../../morm/src/flatexpression.h
-rm.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
-rm.o: ../../../morm/src/jsonexpression.h
+rm.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+rm.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+rm.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h
+rm.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
+rm.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 rm.o: ../../../morm/src/postgresqlexpression.h
-rm.o: ../../../morm/src/dochtmlexpression.h ../../../morm/src/jsonconnector.h
+rm.o: ../../../morm/src/jsonconnector.h
 rm.o: ../../../morm/src/postgresqlconnector.h
 rm.o: ../../../morm/src/postgresqlqueryresult.h
-rm.o: ../../../morm/src/dochtmlconnector.h ../../../winix/winixd/core/dirs.h
+rm.o: ../../../winix/winixd/core/dirs.h
 rm.o: ../../../winix/winixd/core/dircontainer.h
 rm.o: ../../../winix/winixd/core/request.h
 rm.o: ../../../winix/winixd/core/mounts.h mount.h
@@ -3987,15 +4027,16 @@ rmuser.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 rmuser.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 rmuser.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 rmuser.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-rmuser.o: ../../../morm/src/baseexpression.h
+rmuser.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+rmuser.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+rmuser.o: ../../../morm/src/finderhelper.h
+rmuser.o: ../../../morm/src/fieldvaluehelper.h
 rmuser.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 rmuser.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 rmuser.o: ../../../morm/src/postgresqlexpression.h
-rmuser.o: ../../../morm/src/dochtmlexpression.h
 rmuser.o: ../../../morm/src/jsonconnector.h
 rmuser.o: ../../../morm/src/postgresqlconnector.h
 rmuser.o: ../../../morm/src/postgresqlqueryresult.h
-rmuser.o: ../../../morm/src/dochtmlconnector.h
 rmuser.o: ../../../winix/winixd/core/dirs.h
 rmuser.o: ../../../winix/winixd/core/dircontainer.h
 rmuser.o: ../../../winix/winixd/core/request.h
@@ -4098,15 +4139,16 @@ run.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 run.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 run.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 run.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-run.o: ../../../morm/src/baseexpression.h ../../../morm/src/flatexpression.h
-run.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
-run.o: ../../../morm/src/jsonexpression.h
+run.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+run.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+run.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h
+run.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
+run.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 run.o: ../../../morm/src/postgresqlexpression.h
-run.o: ../../../morm/src/dochtmlexpression.h
 run.o: ../../../morm/src/jsonconnector.h
 run.o: ../../../morm/src/postgresqlconnector.h
 run.o: ../../../morm/src/postgresqlqueryresult.h
-run.o: ../../../morm/src/dochtmlconnector.h ../../../winix/winixd/core/dirs.h
+run.o: ../../../winix/winixd/core/dirs.h
 run.o: ../../../winix/winixd/core/dircontainer.h
 run.o: ../../../winix/winixd/core/request.h
 run.o: ../../../winix/winixd/core/mounts.h mount.h
@@ -4204,15 +4246,15 @@ sort.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 sort.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 sort.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 sort.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-sort.o: ../../../morm/src/baseexpression.h ../../../morm/src/flatexpression.h
-sort.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
-sort.o: ../../../morm/src/jsonexpression.h
+sort.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+sort.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+sort.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h
+sort.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
+sort.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 sort.o: ../../../morm/src/postgresqlexpression.h
-sort.o: ../../../morm/src/dochtmlexpression.h
 sort.o: ../../../morm/src/jsonconnector.h
 sort.o: ../../../morm/src/postgresqlconnector.h
 sort.o: ../../../morm/src/postgresqlqueryresult.h
-sort.o: ../../../morm/src/dochtmlconnector.h
 sort.o: ../../../winix/winixd/core/dirs.h
 sort.o: ../../../winix/winixd/core/dircontainer.h
 sort.o: ../../../winix/winixd/core/request.h
@@ -4329,15 +4371,17 @@ specialdefault.o: ../../../morm/src/queryresult.h
 specialdefault.o: ../../../morm/src/flatconnector.h
 specialdefault.o: ../../../morm/src/dbexpression.h
 specialdefault.o: ../../../morm/src/baseexpression.h
+specialdefault.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h
+specialdefault.o: ../../../morm/src/cursorhelper.h
+specialdefault.o: ../../../morm/src/finderhelper.h
+specialdefault.o: ../../../morm/src/fieldvaluehelper.h
 specialdefault.o: ../../../morm/src/flatexpression.h
 specialdefault.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
 specialdefault.o: ../../../morm/src/jsonexpression.h
 specialdefault.o: ../../../morm/src/postgresqlexpression.h
-specialdefault.o: ../../../morm/src/dochtmlexpression.h
 specialdefault.o: ../../../morm/src/jsonconnector.h
 specialdefault.o: ../../../morm/src/postgresqlconnector.h
 specialdefault.o: ../../../morm/src/postgresqlqueryresult.h
-specialdefault.o: ../../../morm/src/dochtmlconnector.h
 specialdefault.o: ../../../winix/winixd/core/dirs.h
 specialdefault.o: ../../../winix/winixd/core/dircontainer.h
 specialdefault.o: ../../../winix/winixd/core/request.h
@@ -4442,15 +4486,15 @@ stat.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 stat.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 stat.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 stat.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-stat.o: ../../../morm/src/baseexpression.h ../../../morm/src/flatexpression.h
-stat.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
-stat.o: ../../../morm/src/jsonexpression.h
+stat.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+stat.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+stat.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h
+stat.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
+stat.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 stat.o: ../../../morm/src/postgresqlexpression.h
-stat.o: ../../../morm/src/dochtmlexpression.h
 stat.o: ../../../morm/src/jsonconnector.h
 stat.o: ../../../morm/src/postgresqlconnector.h
 stat.o: ../../../morm/src/postgresqlqueryresult.h
-stat.o: ../../../morm/src/dochtmlconnector.h
 stat.o: ../../../winix/winixd/core/dirs.h
 stat.o: ../../../winix/winixd/core/dircontainer.h
 stat.o: ../../../winix/winixd/core/request.h
@@ -4557,15 +4601,16 @@ subject.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 subject.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 subject.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 subject.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-subject.o: ../../../morm/src/baseexpression.h
+subject.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+subject.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+subject.o: ../../../morm/src/finderhelper.h
+subject.o: ../../../morm/src/fieldvaluehelper.h
 subject.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 subject.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 subject.o: ../../../morm/src/postgresqlexpression.h
-subject.o: ../../../morm/src/dochtmlexpression.h
 subject.o: ../../../morm/src/jsonconnector.h
 subject.o: ../../../morm/src/postgresqlconnector.h
 subject.o: ../../../morm/src/postgresqlqueryresult.h
-subject.o: ../../../morm/src/dochtmlconnector.h
 subject.o: ../../../winix/winixd/core/dirs.h
 subject.o: ../../../winix/winixd/core/dircontainer.h
 subject.o: ../../../winix/winixd/core/request.h
@@ -4675,15 +4720,16 @@ template.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 template.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 template.o: ../../../morm/src/flatconnector.h
 template.o: ../../../morm/src/dbexpression.h
-template.o: ../../../morm/src/baseexpression.h
+template.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+template.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+template.o: ../../../morm/src/finderhelper.h
+template.o: ../../../morm/src/fieldvaluehelper.h
 template.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 template.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 template.o: ../../../morm/src/postgresqlexpression.h
-template.o: ../../../morm/src/dochtmlexpression.h
 template.o: ../../../morm/src/jsonconnector.h
 template.o: ../../../morm/src/postgresqlconnector.h
 template.o: ../../../morm/src/postgresqlqueryresult.h
-template.o: ../../../morm/src/dochtmlconnector.h
 template.o: ../../../winix/winixd/core/dirs.h
 template.o: ../../../winix/winixd/core/dircontainer.h
 template.o: ../../../winix/winixd/core/request.h
@@ -4794,15 +4840,16 @@ timezone.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 timezone.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 timezone.o: ../../../morm/src/flatconnector.h
 timezone.o: ../../../morm/src/dbexpression.h
-timezone.o: ../../../morm/src/baseexpression.h
+timezone.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+timezone.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+timezone.o: ../../../morm/src/finderhelper.h
+timezone.o: ../../../morm/src/fieldvaluehelper.h
 timezone.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 timezone.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 timezone.o: ../../../morm/src/postgresqlexpression.h
-timezone.o: ../../../morm/src/dochtmlexpression.h
 timezone.o: ../../../morm/src/jsonconnector.h
 timezone.o: ../../../morm/src/postgresqlconnector.h
 timezone.o: ../../../morm/src/postgresqlqueryresult.h
-timezone.o: ../../../morm/src/dochtmlconnector.h
 timezone.o: ../../../winix/winixd/core/dirs.h
 timezone.o: ../../../winix/winixd/core/dircontainer.h
 timezone.o: ../../../winix/winixd/core/request.h
@@ -4911,15 +4958,16 @@ tinymce.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 tinymce.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 tinymce.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 tinymce.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-tinymce.o: ../../../morm/src/baseexpression.h
+tinymce.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+tinymce.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+tinymce.o: ../../../morm/src/finderhelper.h
+tinymce.o: ../../../morm/src/fieldvaluehelper.h
 tinymce.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 tinymce.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 tinymce.o: ../../../morm/src/postgresqlexpression.h
-tinymce.o: ../../../morm/src/dochtmlexpression.h
 tinymce.o: ../../../morm/src/jsonconnector.h
 tinymce.o: ../../../morm/src/postgresqlconnector.h
 tinymce.o: ../../../morm/src/postgresqlqueryresult.h
-tinymce.o: ../../../morm/src/dochtmlconnector.h
 tinymce.o: ../../../winix/winixd/core/dirs.h
 tinymce.o: ../../../winix/winixd/core/dircontainer.h
 tinymce.o: ../../../winix/winixd/core/request.h
@@ -5022,15 +5070,16 @@ uname.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 uname.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 uname.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 uname.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-uname.o: ../../../morm/src/baseexpression.h
+uname.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+uname.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+uname.o: ../../../morm/src/finderhelper.h
+uname.o: ../../../morm/src/fieldvaluehelper.h
 uname.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 uname.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 uname.o: ../../../morm/src/postgresqlexpression.h
-uname.o: ../../../morm/src/dochtmlexpression.h
 uname.o: ../../../morm/src/jsonconnector.h
 uname.o: ../../../morm/src/postgresqlconnector.h
 uname.o: ../../../morm/src/postgresqlqueryresult.h
-uname.o: ../../../morm/src/dochtmlconnector.h
 uname.o: ../../../winix/winixd/core/dirs.h
 uname.o: ../../../winix/winixd/core/dircontainer.h
 uname.o: ../../../winix/winixd/core/request.h
@@ -5136,15 +5185,16 @@ upload.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 upload.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 upload.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 upload.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-upload.o: ../../../morm/src/baseexpression.h
+upload.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+upload.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+upload.o: ../../../morm/src/finderhelper.h
+upload.o: ../../../morm/src/fieldvaluehelper.h
 upload.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 upload.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 upload.o: ../../../morm/src/postgresqlexpression.h
-upload.o: ../../../morm/src/dochtmlexpression.h
 upload.o: ../../../morm/src/jsonconnector.h
 upload.o: ../../../morm/src/postgresqlconnector.h
 upload.o: ../../../morm/src/postgresqlqueryresult.h
-upload.o: ../../../morm/src/dochtmlconnector.h
 upload.o: ../../../winix/winixd/core/dirs.h
 upload.o: ../../../winix/winixd/core/dircontainer.h
 upload.o: ../../../winix/winixd/core/request.h
@@ -5259,15 +5309,16 @@ uptime.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 uptime.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 uptime.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 uptime.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-uptime.o: ../../../morm/src/baseexpression.h
+uptime.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+uptime.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+uptime.o: ../../../morm/src/finderhelper.h
+uptime.o: ../../../morm/src/fieldvaluehelper.h
 uptime.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 uptime.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 uptime.o: ../../../morm/src/postgresqlexpression.h
-uptime.o: ../../../morm/src/dochtmlexpression.h
 uptime.o: ../../../morm/src/jsonconnector.h
 uptime.o: ../../../morm/src/postgresqlconnector.h
 uptime.o: ../../../morm/src/postgresqlqueryresult.h
-uptime.o: ../../../morm/src/dochtmlconnector.h
 uptime.o: ../../../winix/winixd/core/dirs.h
 uptime.o: ../../../winix/winixd/core/dircontainer.h
 uptime.o: ../../../winix/winixd/core/request.h
@@ -5367,15 +5418,16 @@ vim.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 vim.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 vim.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 vim.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-vim.o: ../../../morm/src/baseexpression.h ../../../morm/src/flatexpression.h
-vim.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
-vim.o: ../../../morm/src/jsonexpression.h
+vim.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+vim.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+vim.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h
+vim.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
+vim.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 vim.o: ../../../morm/src/postgresqlexpression.h
-vim.o: ../../../morm/src/dochtmlexpression.h
 vim.o: ../../../morm/src/jsonconnector.h
 vim.o: ../../../morm/src/postgresqlconnector.h
 vim.o: ../../../morm/src/postgresqlqueryresult.h
-vim.o: ../../../morm/src/dochtmlconnector.h ../../../winix/winixd/core/dirs.h
+vim.o: ../../../winix/winixd/core/dirs.h
 vim.o: ../../../winix/winixd/core/dircontainer.h
 vim.o: ../../../winix/winixd/core/request.h
 vim.o: ../../../winix/winixd/core/mounts.h mount.h
@@ -5471,15 +5523,16 @@ who.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 who.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 who.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 who.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-who.o: ../../../morm/src/baseexpression.h ../../../morm/src/flatexpression.h
-who.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
-who.o: ../../../morm/src/jsonexpression.h
+who.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+who.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+who.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h
+who.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
+who.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 who.o: ../../../morm/src/postgresqlexpression.h
-who.o: ../../../morm/src/dochtmlexpression.h
 who.o: ../../../morm/src/jsonconnector.h
 who.o: ../../../morm/src/postgresqlconnector.h
 who.o: ../../../morm/src/postgresqlqueryresult.h
-who.o: ../../../morm/src/dochtmlconnector.h ../../../winix/winixd/core/dirs.h
+who.o: ../../../winix/winixd/core/dirs.h
 who.o: ../../../winix/winixd/core/dircontainer.h
 who.o: ../../../winix/winixd/core/request.h
 who.o: ../../../winix/winixd/core/mounts.h mount.h

winixd/functions/adduser.cpp

@@ -264,6 +264,11 @@ void AddUser::MakePost()
 	const std::wstring & email		= cur->request->PostVar(L"email");
 	bool autoactivate				= false;
 
+	// for slog and locale from fun_passwd to work correctly
+	// but in the future IsPasswordCorrect will be moved to User class
+	// or some other place
+	functions->fun_passwd.set_dependency(this);
+
 	if( !IsLoginCorrect(login, true) ||
 		!IsEmailCorrect(email, true) || 
 		!functions->fun_passwd.IsPasswordCorrect(pass, conf_pass, true) )

winixd/functions/cat.cpp

@@ -51,6 +51,9 @@ Cat::Cat()
 
 void Cat::MakeGet()
 {
+	// IMPROVE ME this probably should be set for all winix functions
+	cur->request->html_template = cur->request->last_item->html_template;
+
 	if( !cur->request->is_item )
 	{
 		log << log1 << "Content: cat function requires an item" << logend;

winixd/functions/functions.cpp

@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2010-2018, Tomasz Sowa
+ * Copyright (c) 2010-2021, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -118,6 +118,13 @@ FunctionBase * Functions::Find(const std::wstring & function_name)
 	if( i == table.end() )
 		return 0;
 
+	FunctionBase * fun = i->second;
+
+	// this is to set 'cur' and 'locale' for slog, but in the future slog will be moved to Session
+	fun->set_cur(cur);
+	fun->set_locale(locale);
+	//
+
 return i->second;
 }
 
@@ -161,7 +168,9 @@ Error Functions::CheckSpecialFile(const Item & item)
 	{
 		log << log3 << "Functions: reloading mount points" << logend;
 
+		cur->mount = system->mounts.GetEmptyMount();
 		system->mounts.ReadMounts(item.content);
+		cur->mount = system->mounts.pmount;
 		templates->ReadNewIndexTemplates();
 		templates->ReadNewChangeTemplates();
 

winixd/functions/ls.cpp

@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2008-2018, Tomasz Sowa
+ * Copyright (c) 2008-2021, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -52,6 +52,13 @@ Ls::Ls()
 
 void Ls::MakeGet()
 {
+	// !! IMPROVE ME
+	// this should be moved to ckeditor function (similarly the html content from fun_ls.html)
+	if( cur->request->IsParam(L"ckeditor_browse") )
+	{
+		cur->request->html_template = config->templates_index_generic;
+	}
+
 	if( !cur->request->is_item )
 	{
 		DbItemQuery iq;

winixd/functions/meta.cpp

@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2011-2018, Tomasz Sowa
+ * Copyright (c) 2011-2021, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -127,6 +127,8 @@ return false;
 
 void Meta::ChangeAdminMeta()
 {
+	// IMPROVE ME we need to show an error msg if the user is not an admin
+
 	if( cur->session->puser && cur->session->puser->super_user )
 	{
 		const std::wstring & meta_str = cur->request->PostVar(L"itemmeta");

winixd/functions/mv.cpp

@@ -584,12 +584,16 @@ bool Mv::MoveFileOrSymlink2(Item & src_file, const std::wstring & dst_path, bool
 	if( !ParseDir(dst_path, check_access) )
 		return false;
 
-	if( src_file.parent_id == out_dir_tab.back()->id )
+	if( out_has_file && src_file.parent_id == out_dir_tab.back()->id && src_file.url == out_item.url )
 	{
-		// actually out_filename is here empty
-		// because ParseDir() have been read it to out_item
-		if( out_filename.empty() || src_file.url == out_filename )
-			return true; // the same file -- there is nothing to do
+		return true; // the same file -- there is nothing to do
+	}
+
+	if( out_has_file )
+	{
+		log << log3 << "Mv: such file already exists (skipping)" << logend;
+		slog << logerror << T("mv_file_exists") << logend;
+		return false;
 	}
 
 	return MoveFileOrSymlink(src_file, out_dir_tab, out_filename);

winixd/functions/run.cpp

@@ -60,6 +60,9 @@ void Run::MakePost()
 
 void Run::MakeGet()
 {
+	// IMPROVE ME this probably should be set for all winix functions
+	cur->request->html_template = cur->request->last_item->html_template;
+
 	if( !cur->request->is_item )
 	{
 		log << log1 << "Content: Run function requires an item" << logend;

winixd/functions/template.cpp

@@ -97,12 +97,17 @@ void Template::CreateTemplateFileName(const std::wstring & index_str)
 	}
 	else
 	if( index == 1 )
+	{
+		html_template = config->templates_index_generic;
+	}
+	else
+	if( index == 2 )
 	{
 		html_template = config->templates_index_raw;
 	}
 	else
 	{
-		index -= 2;
+		index -= 3;
 		Mount::ParamRow & par = system->mounts.pmount->param[system->mounts.MountParHtmlTemplate()];
 		
 		if( !par.defined || (size_t)index >= par.arg.size() )

winixd/html/dir_last_info.html

@@ -1,4 +1,4 @@
-<p class="winix_iteminfo">
+<p class="uk-text-meta">
 	{added_by}: [dir_last_user], [dir_last_date_creation_nice]
 	
 	[if not dir_last_dates_equal]

winixd/html/fun_account.html

@@ -1,20 +1,56 @@
 <div class="winix">
 
-<h1>Account</h1>
+<h1>{account_header}</h1>
 
 [if user_logged]
-	<p>You are logged as: [user_name]<br>
-	[if user_super_user]
-	You are the root
-	[end]
-	[# !! IMPROVE ME add info about groups, may other parameters like time zone, language?]
-	</p>
+
+	<table class="uk-table uk-table-divider uk-table-small uk-table-justify">
+		<tbody>
+			<tr>
+				<td class="uk-width-1-4">{account_logged_as}</td>
+				<td>[user_name]</td>
+				<td></td>
+			</tr>
+
+			[if user_super_user]
+			<tr>
+				<td>{account_admin}</td>
+				<td>{account_admin_yes}</td>
+				<td></td>
+			</tr>
+			[end]
+
+			[if false]
+			[# improve me]
+			<tr>
+				<td>{account_groups}</td>
+				<td>html, www, foo</td>
+				<td></td>
+			</tr>
+			[end]
+
+			<tr>
+				<td>{account_timezone}</td>
+				<td>[user_time_zone_name]</td>
+				<td>
+				<a href="[dir]timezone" class="uk-button uk-button-default uk-button-small">{change}</a>
+				</td>
+			</tr>
+
+			<tr>
+				<td>{account_language}</td>
+				<td>[user_locale_name]</td>
+				<td>
+				<a href="[dir]locale" class="uk-button uk-button-default uk-button-small">{change}</a>
+				</td>
+			</tr>
+		</tbody>
+	</table>
+
+
 [else]
-	<p>You are not logged in.</p>
+	<p>{account_not_logged}</p>
 [end]
 
 
-
-
-
 </div>

winixd/html/fun_adduser.html

@@ -2,39 +2,62 @@
 
 <h1>[if user_logged]{adduser_header_add}[else]{adduser_header_register}[end]</h1>
 
-<form id="additem" method="post" action="[doc_base_url][dir]adduser">
-<fieldset>
-	<legend>{adduser_form_legend}</legend>
-	
-	<p class="withnext">{adduser_login}:</p>
-	<input class="edit" type="text" name="login" value="[adduser_last_login]">
-	
-	<p class="withnext">{adduser_password}:</p>
-	<input class="edit" type="password" name="password" value="">
+<form class="uk-form-stacked" method="post" action="[doc_base_url][dir]adduser">
 
-	<p class="withnext">{adduser_confirm_password}:</p>
-	<input class="edit" type="password" name="passwordconfirm" value="">
+	<div class="uk-margin">
+		<label class="uk-form-label" for="winix_adduser_login">{adduser_login}</label>
 
-	[if winix_account_need_email_verification]	
-		<p class="withnext">{adduser_need_email}<br>{adduser_need_email2}:</p>
-	[else]
-		<p class="withnext">{adduser_email}:</p>
-	[end]
-	<input class="edit" type="text" name="email" value="[adduser_last_email]">
+		<div class="uk-form-controls">
+			<input class="uk-input" id="winix_adduser_login" type="text" name="login" value="[adduser_last_login]">
+		</div>
+	</div>
+
+	<div class="uk-margin">
+		<label class="uk-form-label" for="winix_adduser_password">{adduser_password}</label>
+
+		<div class="uk-form-controls">
+			<input class="uk-input" id="winix_adduser_password" type="password" name="password" value="">
+		</div>
+	</div>
+
+	<div class="uk-margin">
+		<label class="uk-form-label" for="winix_adduser_confirm_password">{adduser_confirm_password}</label>
+
+		<div class="uk-form-controls">
+			<input class="uk-input" id="winix_adduser_confirm_password" type="password" name="passwordconfirm" value="">
+		</div>
+	</div>
+
+	<div class="uk-margin">
+		[if winix_account_need_email_verification]
+			<label class="uk-form-label" for="winix_adduser_email">{adduser_need_email}</label>
+		[else]
+			<label class="uk-form-label" for="winix_adduser_email">{adduser_email}</label>
+		[end]
+
+		<div class="uk-form-controls">
+			<input class="uk-input" id="winix_adduser_email" type="text" name="email" value="[adduser_last_email]">
+		</div>
+	</div>
 
 	[if user_super_user]
-	<p>
-		<input type="checkbox" name="autoactivate" id="autoactivate"><label style="display: inline;" for="autoactivate">{adduser_auto_activate}</label>
-	</p>
+	<div class="uk-margin">
+		<div class="uk-form-controls">
+			<label><input class="uk-checkbox uk-margin-small-right" type="checkbox" name="autoactivate" id="autoactivate">{adduser_auto_activate}</label>
+		</div>
+	</div>
 	[end]
 
 	[if winix_function_param_is "postredirect"]
 		<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 	[end]
 
-	
-	<input class="submit" type="submit" value="[if user_logged]{adduser_submit}[else]{register_user_submit}[end]">
-</fieldset>
+	<div class="uk-margin">
+		<div class="uk-form-controls">
+			<input class="uk-button uk-button-primary" type="submit" value="[if user_logged]{adduser_submit}[else]{register_user_submit}[end]">
+		</div>
+	</div>
+
 </form>
 
 </div>

winixd/html/fun_ckeditor.html

@@ -1,75 +1,80 @@
 <div class="winix">
 
 [if item_is]<h1>{edit}</h1>[else]<h1>{add}</h1>[end]
-	
-	[if mount_type_is "cms"]
-		<div class="winix_input_a">
-		<label for="winix_title_id">{title}:</label>
-		<input id="winix_title_id" type="text" name="subject" value="[item_subject]">
-		</div>
 
-		<div class="winix_input_a">
-		<label for="winix_url_id">{suggested_url}:</label>
-		<input id="winix_url_id" type="text" name="url" value="[item_url]">
+<form class="uk-form-stacked">
+	
+	[if one [mount_type_is "cms"] [any [mount_type_is "thread"] [thread_mount_arg_is "subject"]]]
+	<div class="uk-margin">
+		<label class="uk-form-label" for="winix_title_id">{title}</label>
+		<div class="uk-form-controls">
+			<input class="uk-input" id="winix_title_id" type="text" name="subject" value="[item_subject]" [if not item_is]autofocus [end]>
 		</div>
+	</div>
+
+	<div class="uk-margin">
+		<label class="uk-form-label" for="winix_url_id">{suggested_url}</label>
+		<div class="uk-form-controls">
+			<input class="uk-input" id="winix_url_id" type="text" name="url" value="[item_url]">
+		</div>
+	</div>
 	[end]
 	
-	[if any [mount_type_is "thread"] [thread_mount_arg_is "subject"]]
-		<div class="winix_input_a">
-		<label for="winix_title_id">{title}:</label>
-		<input id="winix_title_id" type="text" name="subject" value="[item_subject]">
-		</div>
-		
-		<div class="winix_input_a">
-		<label for="winix_url_id">{suggested_url}:</label>
-		<input id="winix_url_id" type="text" name="url" value="[item_url]">
-		</div>
-	[end]
 	
-	<div class="winix_input_a">
-	[if mount_type_is "cms"]<label for="winix_content_id">{form_emacs_content_cms}</label>[end]
-	[if mount_type_is "thread"]<label for="winix_content_id">{form_emacs_content_thread}</label>[end]
-	[if mount_type_is "ticket"]<label for="winix_content_id">{form_emacs_content_ticket}</label>[end]
+	<div class="uk-margin">
+	[if mount_type_is "cms"]<label class="uk-form-label" for="winix_content_id">{form_emacs_content_cms}</label>[end]
+	[if mount_type_is "thread"]<label class="uk-form-label" for="winix_content_id">{form_emacs_content_thread}</label>[end]
+	[if mount_type_is "ticket"]<label class="uk-form-label" for="winix_content_id">{form_emacs_content_ticket}</label>[end]
 	
 	[# template fun_ls.html uses the name: itemcontent to refer to this textarea item]
 
-
-	<div style="border-top: 1px solid #dadada; border-bottom: 1px solid #dadada; padding: 0.2em 0 0.2em 0; margin: 1em 0 1em 0;" id="winix-editor-content" data-winix-post-name="itemcontent">[item_print_content]</div>
-
+	<div class="uk-form-controls">
+		<div style="border-top: 1px solid #dadada; border-bottom: 1px solid #dadada; padding: 0.2em 0 0.2em 0; margin: 1em 0 1em 0;" id="winix-editor-content" data-winix-post-name="itemcontent">[item_print_content]</div>
+	</div>
 	
 	</div>
 
-	<input id="contenttype" type="hidden" name="contenttype" value="2">
-	
+	<div class="uk-form-controls">
+		<input id="contenttype" type="hidden" name="contenttype" value="2">
+	</div>
 
 	[if not user_logged]
-		<div class="winix_input_a">
-		<label for="winix_nick_id">{nick}:</label>
-		<input id="winix_nick_id" type="text" name="guestname" value="[item_guest_name]">
+		<div class="uk-margin">
+			<label class="uk-form-label" for="winix_nick_id">{nick}</label>
+			<div class="uk-form-controls">
+				<input class="uk-input" id="winix_nick_id" type="text" name="guestname" value="[item_guest_name]">
+			</div>
 		</div>
 
-		<div class="winix_input_a">
-		<label for="winix_rebus_id">{rebus_how_is_it} [rebus_question]?</p>
-		<input id="winix_rebus_id" type="text" name="rebus">
+		<div class="uk-margin">
+			<label class="uk-form-label" for="winix_rebus_id">{rebus_how_is_it} [rebus_question]?</label>
+			<div class="uk-form-controls">
+				<input class="uk-input" id="winix_rebus_id" type="text" name="rebus">
+			</div>
 		</div>
 		
 		[include "antispam.html"]
 	[end]
 	
 
-	<div class="winix-update-button-container">
-		<button class="winix_update_button" data-winix-function-path="[doc_base_url][dir][if item_is][item_url]/[end]ckeditor"
-											data-winix-content-ckeditor-instances="winix-editor-content"
-											data-winix-content-inputs="winix_url_id,winix_title_id,contenttype"
-											data-winix-progressbar-id="winix-editor-progressbar"
-											data-winix-messages-status-success-id="winix-editor-messages-status-success"
-											data-winix-messages-status-error-id="winix-editor-messages-status-error"
-											>
-			Aktualizuj
-		</button>
+	<div class="uk-margin">
+		<div class="uk-form-controls uk-inline">
+
+			<button class="uk-button uk-button-primary winix_update_button"
+				data-winix-function-path="[doc_base_url][dir][if item_is][item_url]/[end]ckeditor"
+				data-winix-content-ckeditor-instances="winix-editor-content"
+				data-winix-content-inputs="winix_url_id,winix_title_id,contenttype"
+				data-winix-progressbar-id="winix-editor-progressbar"
+				data-winix-messages-status-success-id="winix-editor-messages-status-success"
+				data-winix-messages-status-error-id="winix-editor-messages-status-error"
+				>
+				{ckeditor_update_button}
+			</button>
+
+			<div id="winix-editor-progressbar" class="uk-invisible uk-position-center-right-out uk-margin-small-left">
+				<img src="[doc_base_url_common]/progressbars/progressbar_fading_lines_16x16.gif" alt="{ckeditor_update_progressbar_img_alt}">
+			</div>
 
-		<div id="winix-editor-progressbar" class="winix-progressbar">
-			<img src="[doc_base_url_common]/progressbars/progressbar_fading_lines_16x16.gif" alt="progress bar">
 		</div>
 
 		<div id="winix-editor-messages-status-success" class="winix-editor-messages-status-success">
@@ -88,4 +93,6 @@
 	[ckeditor_old_browsers_support]
 	[ckeditor "winix-editor-content"]
 
+</form>
+
 </div>

winixd/html/fun_cp.html

@@ -2,38 +2,52 @@
 
 <h1>{cp_header}</h1>
 
+<p>
+	[if item_is]{cp_page} [item_url] [else]{cp_dir} [dir_without_slash][end]
+</p>
 
-<form id="additem" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]cp[if not item_is]/r[end]">
-<fieldset>
-	<legend>{cp_form_legend}</legend>
-	
-	<p>
-	[if item_is]{cp_page} "[item_url]":[else]{cp_dir} "[dir_without_slash]"[end]
-	</p>
-	
-	
-	<p class="withnext">{suggested_url}</p>
-	<input class="edit" type="text" name="to" value="[dir_without_slash][if item_is]/[item_url][end]">
-	
-	<p>
-	<label><input type="checkbox" name="preserveattr">{cp_preserve_attr}</label>
-	
-	[if not item_is]
-	<label><input type="checkbox" name="onlycontent">{cp_only_content}</label>
-	<label><input type="checkbox" name="removedefaults" checked="checked">{cp_remove_defaults}</label>
-	<label><input type="checkbox" name="followsymlinks" checked="checked">{cp_follow_symlinks}</label>
-	[end]
-	</p>
+
+<form class="uk-form-stacked uk-width-1-2@s" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]cp[if not item_is]/r[end]">
+
+	<div class="uk-margin">
+		<label class="uk-form-label" for="winix_url">{suggested_url}</label>
+
+		<div class="uk-form-controls">
+			<input class="uk-input" id="winix_url" type="text" name="to" value="[dir_without_slash][if item_is]/[item_url][end]">
+		</div>
+	</div>
+
+	<div class="uk-margin">
+		<div class="uk-margin-small-top">
+			<label><input class="uk-checkbox uk-margin-small-right" type="checkbox" name="preserveattr">{cp_preserve_attr}</label>
+		</div>
+
+		[if not item_is]
+
+			<div class="uk-margin-small-top">
+				<label><input class="uk-checkbox uk-margin-small-right" type="checkbox" name="onlycontent">{cp_only_content}</label>
+			</div>
+
+			<div class="uk-margin-small-top">
+				<label><input class="uk-checkbox uk-margin-small-right" type="checkbox" name="removedefaults" checked="checked">{cp_remove_defaults}</label>
+			</div>
+
+			<div class="uk-margin-small-top">
+				<label><input class="uk-checkbox uk-margin-small-right" type="checkbox" name="followsymlinks" checked="checked">{cp_follow_symlinks}</label>
+			</div>
+
+		[end]
+	</div>
 
 	[if winix_function_param_is "postredirect"]
 		<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 	[end]
 
 	
-	<input class="submit" type="submit" value="{copy}">
-</fieldset>
+	<div class="uk-margin">
+		<input class="uk-button uk-button-primary" type="submit" value="{copy}">
+	</div>
+
 </form>
 
-
-
 </div>

winixd/html/fun_createthread.html

@@ -3,27 +3,40 @@
 <h1>{create_thread_header}</h1>
 
 
-
-<form id="additem" method="post" action="[doc_base_url][dir]createthread">
-<fieldset>
-	<legend>{form_thread_legend}</legend>
+<form class="uk-form-stacked" method="post" action="[doc_base_url][dir]createthread">
 	
-	<p class="withnext">{title}:</p>
-	<input class="edit" type="text" name="subject" value="[item_subject]">
+	<div class="uk-margin">
+		<label class="uk-form-label" for="winix_title_id">{title}</label>
+		<div class="uk-form-controls">
+			<input class="uk-input" id="winix_title_id" type="text" name="subject" value="[item_subject]">
+		</div>
+	</div>
 	
 	[if thread_mount_arg_is "subject"]
-		<p class="withnext">{suggested_url}:</p>
-		<input class="edit" type="text" name="url" value="[item_url]">
+		<div class="uk-margin">
+			<label class="uk-form-label" for="winix_url_id">{suggested_url}</label>
+			<div class="uk-form-controls">
+				<input class="uk-input" id="winix_url_id" type="text" name="url" value="[item_url]">
+			</div>
+		</div>
 	[end]
 	
 	[include "fun_emacs_post.html"]
 		
 	[if not user_logged]
-		<p class="withnext">{nick}:</p>
-		<input class="edit" type="text" name="guestname" value="[item_guest_name]">
-		
-		<p class="withnext">{rebus_how_is_it} [rebus_question]?</p>
-		<input class="edit" type="text" name="rebus">
+		<div class="uk-margin">
+			<label class="uk-form-label" for="winix_nick_id">{nick}</label>
+			<div class="uk-form-controls">
+				<input class="uk-input" id="winix_nick_id" type="text" name="guestname" value="[item_guest_name]">
+			</div>
+		</div>
+
+		<div class="uk-margin">
+			<label class="uk-form-label" for="winix_rebus_id">{rebus_how_is_it} [rebus_question]?</label>
+			<div class="uk-form-controls">
+				<input class="uk-input" id="winix_rebus_id" type="text" name="rebus">
+			</div>
+		</div>
 		
 		[include "antispam.html"]
 	[end]
@@ -31,9 +44,12 @@
 	[if winix_function_param_is "postredirect"]
 		<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 	[end]
+
 	
-	<input class="submit" type="submit" value="{button_thread_submit}">
-</fieldset>
+	<div class="uk-margin">
+		<input class="uk-button uk-button-primary" type="submit" value="{button_thread_submit}">
+	</div>
+
 </form>
 
 </div>

winixd/html/fun_createticket.html

@@ -8,116 +8,180 @@
 
 
 
-<form method="post" action="[doc_base_url][dir][if item_is][item_url]/editticket[else]createticket[end]" enctype="multipart/form-data">
+<form class="uk-form-stacked" method="post" action="[doc_base_url][dir][if item_is][item_url]/editticket[else]createticket[end]" enctype="multipart/form-data">
 
 
-<div class="winix_input_a">
-<label for="winix_title_id">{title}:</label>
-<input id="winix_title_id" type="text" name="subject" value="[item_subject]">
+<div class="uk-margin">
+	<label class="uk-form-label" for="winix_title_id">{title}</label>
+	<div class="uk-form-controls">
+		<input class="uk-input" id="winix_title_id" type="text" name="subject" value="[item_subject]">
+	</div>
 </div>
 
 
 [if ticket_tab]
-	<table class="winix_create_ticket">
+
 	
 	[for ticket_tab]
-	
-		<tr>
-		<th>[filter fil_firstup][ticket_tab_param_name]:[end]</th>
-	
-		<td>
 		
 		[if ticket_tab_type_is "select"]
-			<select name="ticketparam[ticket_tab_param_id]">
-			[for ticket_tab_select_tab]
-				<option [if ticket_tab_select_tab_is_selected]selected [end]value="[ticket_tab_select_tab_id]">[ticket_tab_select_tab_name]</option>
-			[end]
-			</select>
+			<div class="uk-margin">
+				<label class="uk-form-label" for="winix_ticket_select_id_[ticket_tab_param_id]">[filter fil_firstup][ticket_tab_param_name][end]</label>
+
+				<div class="uk-form-controls">
+					<select class="uk-select" id="winix_ticket_select_id_[ticket_tab_param_id]" name="ticketparam[ticket_tab_param_id]">
+					[for ticket_tab_select_tab]
+						<option [if ticket_tab_select_tab_is_selected]selected [end]value="[ticket_tab_select_tab_id]">[ticket_tab_select_tab_name]</option>
+					[end]
+					</select>
+				</div>
+			</div>
 		[end]
 	
 	
 		[if one [ticket_tab_type_is "integer"] [ticket_tab_type_is "progress"] [ticket_tab_type_is "string"]]
-			<input type="text" name="ticketparam[ticket_tab_param_id]" value="[ticket_tab_value]">
+			<div class="uk-margin">
+				<label class="uk-form-label" for="winix_ticket_input_id_[ticket_tab_param_id]">[filter fil_firstup][ticket_tab_param_name][end]</label>
+
+				<div class="uk-form-controls">
+					<input class="uk-input" id="winix_ticket_input_id_[ticket_tab_param_id]" type="text" name="ticketparam[ticket_tab_param_id]" value="[ticket_tab_value]">
+				</div>
+			</div>
 		[end]
 
 	
 		[if ticket_tab_type_is "multistring"]
-			<textarea name="ticketparam[ticket_tab_param_id]" rows="10" cols="60">[ticket_tab_value]</textarea>
+			<div class="uk-margin">
+				<label class="uk-form-label" for="winix_ticket_textarea_id_[ticket_tab_param_id]">[filter fil_firstup][ticket_tab_param_name][end]</label>
+
+				<div class="uk-form-controls">
+					<textarea class="uk-textarea" id="winix_ticket_textarea_id_[ticket_tab_param_id]" name="ticketparam[ticket_tab_param_id]" rows="10" cols="60">[ticket_tab_value]</textarea>
+				</div>
+			</div>
 		[end]
 
 
 		[if ticket_tab_type_is "images"]
-			[for ticket_tab_file_tab]
-			<div class="winix_create_ticket_file_row">
-				<img src="[doc_base_url][ticket_tab_file_tab_path]/-/thumb" alt="[ticket_tab_file_tab_path]" height="150">
-				<input type="submit" name="ticketdeletefile_[ticket_tab_file_tab_itemid]" value="{ticket_delete_file}">
+			<div class="uk-margin">
+				<label class="uk-form-label" for="winix_ticket_images_id_[ticket_tab_param_id]">[filter fil_firstup][ticket_tab_param_name][end]</label>
+
+				<div uk-form-custom="target: true">
+					<input type="file" id="winix_ticket_images_id_[ticket_tab_param_id]" name="ticketparam[ticket_tab_param_id]" multiple>
+					<input class="uk-input" type="text" placeholder="{form_ticket_select_file}" disabled>
+				</div>
+
+				<button class="uk-button uk-button-default" type="submit" name="fileuploadsubmit">{add}</button>
 			</div>
-			[end]
+
+
+			<div class="uk-margin">
+				<div class="uk-child-width-1-3@m" uk-grid uk-lightbox="animation: slide">
+				[for ticket_tab_file_tab]
+					<div class="uk-inline">
+						<a class="uk-inline" href="[doc_base_url][ticket_tab_file_tab_path]" data-caption="[ticket_tab_file_tab_path]">
+							<img src="[doc_base_url][ticket_tab_file_tab_path]/-/thumb" alt="[ticket_tab_file_tab_path]">
+						</a>
+
+						<button class="uk-button uk-button-default uk-button-small uk-position-small uk-position-top-right uk-overlay uk-overlay-default uk-padding-small uk-padding-remove-top uk-padding-remove-bottom"
+							    type="submit"
+							    name="ticketdeletefile_[ticket_tab_file_tab_itemid]"
+							    data-uk-tooltip="title: {ticket_delete_file}">
+
+							<span uk-icon="trash"></span>
+						</button>
+					</div>
+				[end]
+				</div>
+
+			</div>
+
 			
-			<input size="30" type="file" name="ticketparam[ticket_tab_param_id]" multiple>
-			<input type="submit" name="fileuploadsubmit" value="{add}">
 		[end]
 
 
 		[if ticket_tab_type_is "files"]
+			<div class="uk-margin">
+				<label class="uk-form-label" for="winix_ticket_files_id_[ticket_tab_param_id]">[filter fil_firstup][ticket_tab_param_name][end]</label>
+
+				<div uk-form-custom="target: true">
+					<input type="file" id="winix_ticket_files_id_[ticket_tab_param_id]" name="ticketparam[ticket_tab_param_id]" multiple>
+					<input class="uk-input" type="text" placeholder="{form_ticket_select_file}" disabled>
+				</div>
+
+				<button class="uk-button uk-button-default" type="submit" name="fileuploadsubmit">{add}</button>
+			</div>
+
 			[if ticket_tab_file_tab]
+			<div class="uk-margin">
 				<ul>
 				[for ticket_tab_file_tab]
 					<li>
 						<a href="[doc_base_url][ticket_tab_file_tab_path]/download">[ticket_tab_file_tab_path]</a>
-						[# !! CHECK ME how this look like -- css was not set]
-						<input type="submit" name="ticketdeletefile_[ticket_tab_file_tab_itemid]" value="{ticket_delete_file}">
+						<button class="uk-button uk-button-default uk-button-small"
+								type="submit"
+								name="ticketdeletefile_[ticket_tab_file_tab_itemid]"
+								value="{ticket_delete_file}"
+								data-uk-tooltip="title: {ticket_delete_file}">
+
+								<span uk-icon="trash"></span>
+						</button>
 					</li>
 				[end]
 				</ul>
+			</div>
 			[end]
-		
-			<input size="30" type="file" name="ticketparam[ticket_tab_param_id]" multiple>
-			<input type="submit" name="fileuploadsubmit" value="{add}">
 		[end]
 
 		[if any_not [ticket_tab_type_is "images"] [ticket_tab_type_is "files"] ticket_is_creating_new ticket_tab_has_value]
-			{ticket_value_not_set}
+		<div class="uk-alert-warning" uk-alert>
+			<p>{ticket_value_not_set}</p>
+		</div>
 		[end]
 
-		</td>
-		</tr>
-		
 	[end]
-	
-	</table>
+
 [end]
 
 
 [# FIXME !! change names form_emacs_content_thread and form_emacs_content_ticket]
-<div class="winix_input_a">
-<label for="winix_content_id">{form_emacs_content_ticket}</label>
-<textarea id="winix_content_id" rows="10" cols="60" name="itemcontent">[item_content]</textarea>
+<div class="uk-margin">
+	<label for="winix_content_id">{form_emacs_content_ticket}</label>
+
+	<div class="uk-form-controls">
+		<textarea class="uk-textarea" id="winix_content_id" rows="10" cols="60" name="itemcontent">[item_content]</textarea>
+	</div>
 </div>
 
 
-<div class="winix_input_a">
-<label for="winix_content_type_id">{form_emacs_content_type}</label>
-<select id="winix_content_type_id" name="contenttype">
-	<option[if item_content_type_is "text"] selected[end] value="0">{form_emacs_content_type_text}</option>
-	<option[if item_content_type_is "formatted text"] selected[end] value="1">{form_emacs_content_type_formatted_text}</option>
-	[if user_can_use_html]<option[if item_content_type_is "html"] selected[end] value="2">{form_emacs_content_type_html}</option>[end]
-	[if user_can_use_bbcode]<option[if item_content_type_is "bbcode"] selected[end] value="3">{form_emacs_content_type_bbcode}</option>[end]
-	[if user_can_use_other]<option[if item_content_type_is "other"] selected[end] value="4">{form_emacs_content_type_other}</option>[end]
-</select>
+<div class="uk-margin">
+	<label for="winix_content_type_id">{form_emacs_content_type}</label>
+
+	<div class="uk-form-controls">
+		<select class="uk-select" id="winix_content_type_id" name="contenttype">
+			<option[if item_content_type_is "text"] selected[end] value="0">{form_emacs_content_type_text}</option>
+			<option[if item_content_type_is "formatted text"] selected[end] value="1">{form_emacs_content_type_formatted_text}</option>
+			[if user_can_use_html]<option[if item_content_type_is "html"] selected[end] value="2">{form_emacs_content_type_html}</option>[end]
+			[if user_can_use_bbcode]<option[if item_content_type_is "bbcode"] selected[end] value="3">{form_emacs_content_type_bbcode}</option>[end]
+			[if user_can_use_other]<option[if item_content_type_is "other"] selected[end] value="4">{form_emacs_content_type_other}</option>[end]
+		</select>
+	</div>
 </div>
 
 
 
 [if not user_logged]
-	<div class="winix_input_a">
-	<label for="winix_nick_id">{nick}:</label>
-	<input id="winix_nick_id" type="text" name="guestname" value="[item_guest_name]">
+	<div class="uk-margin">
+		<label class="uk-form-label" for="winix_nick_id">{nick}</label>
+		<div class="uk-form-controls">
+			<input class="uk-input" id="winix_nick_id" type="text" name="guestname" value="[item_guest_name]">
+		</div>
 	</div>
-	
-	<div class="winix_input_a">
-	<label for="winix_rebus_id">{rebus_how_is_it} [rebus_question]?</p>
-	<input id="winix_rebus_id" type="text" name="rebus">
+
+	<div class="uk-margin">
+		<label class="uk-form-label" for="winix_rebus_id">{rebus_how_is_it} [rebus_question]?</label>
+		<div class="uk-form-controls">
+			<input class="uk-input" id="winix_rebus_id" type="text" name="rebus">
+		</div>
 	</div>
 	
 	[include "antispam.html"]
@@ -128,8 +192,9 @@
 	<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 [end]
 
-
-<input type="submit" value="[if item_is]{form_ticket_edit_submit}[else]{form_ticket_create_submit}[end]">
+<div class="uk-margin">
+	<input class="uk-button uk-button-primary" type="submit" value="[if item_is]{form_ticket_edit_submit}[else]{form_ticket_create_submit}[end]">
+</div>
 
 
 </form>

winixd/html/fun_default.html

@@ -3,22 +3,28 @@
 <h1>{default_header}</h1>
 
 
-<form id="additem" method="post" action="[doc_base_url][dir]default">
-<fieldset>
-	<legend>{form_default_legend}</legend>
-	{url}:<br>
-	<input class="edit" type="text" name="linkto" value="[dir_last_link_to]">
+<form class="uk-form-stacked uk-width-1-2@s" method="post" action="[doc_base_url][dir]default">
 
-	<p>	
-	<label><input class="" type="checkbox" name="makeredirect"[if dir_last_is_link_redirect] checked="checked"[end]>{default_make_redirect}</label>
-	</p>
+	<div class="uk-margin">
+		<label class="uk-form-label" for="winix_url">{url}</label>
+
+		<div class="uk-form-controls">
+			<input class="uk-input" id="winix_url" type="text" name="linkto" value="[dir_last_link_to]">
+		</div>
+	</div>
+
+	<div class="uk-margin">
+		<label><input class="uk-checkbox uk-margin-small-right" type="checkbox" name="makeredirect"[if dir_last_is_link_redirect] checked="checked"[end]>{default_make_redirect}</label>
+	</div>
 
 	[if winix_function_param_is "postredirect"]
 		<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 	[end]
 	
-	<input class="submit" type="submit" value="{change}">
-</fieldset>
+	<div class="uk-margin">
+		<input class="uk-button uk-button-primary" type="submit" value="{change}">
+	</div>
+
 </form>
 
 

winixd/html/fun_emacs.html

@@ -4,39 +4,51 @@
 
 
 
-<form method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]emacs">
-	
-	<div class="winix_input_a">
-	<label for="winix_title_id">{title}:</label>
-	<input id="winix_title_id" type="text" name="subject" value="[item_subject]" [if not item_is]autofocus [end]>
+<form class="uk-form-stacked" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]emacs">
+
+	<div class="uk-margin">
+		<label class="uk-form-label" for="winix_title_id">{title}</label>
+		<div class="uk-form-controls">
+			<input class="uk-input" id="winix_title_id" type="text" name="subject" value="[item_subject]" [if not item_is]autofocus [end]>
+		</div>
 	</div>
 
-	<div class="winix_input_a">
-	<label for="winix_url_id">{suggested_url}:</label>
-	<input id="winix_url_id" type="text" name="url" value="[item_url]">
+	<div class="uk-margin">
+		<label class="uk-form-label" for="winix_url_id">{suggested_url}</label>
+		<div class="uk-form-controls">
+			<input class="uk-input" id="winix_url_id" type="text" name="url" value="[item_url]">
+		</div>
 	</div>
 	
 	[include "fun_emacs_post.html"]
 	
 	[if not user_logged]
-		<div class="winix_input_a">
-		<label for="winix_nick_id">{nick}:</label>
-		<input id="winix_nick_id" type="text" name="guestname" value="[item_guest_name]">
+		<div class="uk-margin">
+			<label class="uk-form-label" for="winix_nick_id">{nick}</label>
+			<div class="uk-form-controls">
+				<input class="uk-input" id="winix_nick_id" type="text" name="guestname" value="[item_guest_name]">
+			</div>
 		</div>
 		
-		<div class="winix_input_a">
-		<label for="winix_rebus_id">{rebus_how_is_it} [rebus_question]?</label>
-		<input id="winix_rebus_id" type="text" name="rebus">
+		<div class="uk-margin">
+			<label class="uk-form-label" for="winix_rebus_id">{rebus_how_is_it} [rebus_question]?</label>
+			<div class="uk-form-controls">
+				<input class="uk-input" id="winix_rebus_id" type="text" name="rebus">
+			</div>
 		</div>
 
 		[include "antispam.html"]
 	[end]
 
 	[if winix_function_param_is "postredirect"]
+	<div class="uk-form-controls">
 		<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
+	</div>
 	[end]
 	
-	<input type="submit" value="[if item_is]{change}[else]{add}[end]">
+	<div class="uk-margin uk-form-controls">
+		<input class="uk-button uk-button-primary" type="submit" value="[if item_is]{change}[else]{add}[end]">
+	</div>
 
 </form>
 

winixd/html/fun_emacs_post.html

@@ -1,21 +1,24 @@
 
-<div class="winix_input_a">
+<div class="uk-margin">
 
 [if winix_function_is "upload"]
-	<label for="winix_content_id">{upload_content}</label>
+	<label class="uk-form-label" for="winix_content_id">{upload_content}</label>
 [else]
-	[if mount_type_is "cms"]<label for="winix_content_id">{form_emacs_content_cms}</label>[end]
-	[if mount_type_is "thread"]<label for="winix_content_id">{form_emacs_content_thread}</label>[end]
-	[if mount_type_is "ticket"]<label for="winix_content_id">{form_emacs_content_ticket}</label>[end]
+	[if mount_type_is "cms"]<label class="uk-form-label" for="winix_content_id">{form_emacs_content_cms}</label>[end]
+	[if mount_type_is "thread"]<label class="uk-form-label" for="winix_content_id">{form_emacs_content_thread}</label>[end]
+	[if mount_type_is "ticket"]<label class="uk-form-label" for="winix_content_id">{form_emacs_content_ticket}</label>[end]
 [end]
 
-<textarea [if item_is]autofocus [end]id="winix_content_id" rows="[if winix_function_is "upload"]7[else][if mount_type_is "cms"]30[else]10[end][end]" cols="60" name="itemcontent">[item_content]</textarea>
+<div class="uk-form-controls">
+	[# CodeMirror doesn't work correctly inside fieldset tag -- horizontal scroll is broken]
+	<textarea class="uk-textarea" [if item_is]autofocus [end]id="winix_content_id" rows="[if winix_function_is "upload"]7[else][if mount_type_is "cms"]30[else]10[end][end]" cols="60" name="itemcontent">[item_content]</textarea>
+</div>
 </div>
 
 
-<div class="winix_input_a">
-<label for="winix_contenttype_id">{form_emacs_content_type}</label>
-<select name="contenttype" id="winix_contenttype_id">
+<div class="uk-margin">
+<label class="uk-form-label" for="winix_contenttype_id">{form_emacs_content_type}</label>
+<select class="uk-select" name="contenttype" id="winix_contenttype_id">
 	<option[if item_content_type_is "text"] selected[end] value="0">{form_emacs_content_type_text}</option>
 	<option[if item_content_type_is "formatted text"] selected[end] value="1">{form_emacs_content_type_formatted_text}</option>
 	[if user_can_use_html]<option[if item_content_type_is "html"] selected[end] value="2">{form_emacs_content_type_html}</option>[end]

winixd/html/fun_env.html

@@ -5,51 +5,61 @@
 
 [if user_super_user]
 
-	[if winix_function_param_is "a"]
-		<p class="withnext">{env_change_admin_env_for_user}:</p>
-	[else]
-		<p class="withnext">{env_change_env_for_user}:</p>
-	[end]
+	<form class="uk-form-stacked uk-width-1-2@s" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]env[if winix_function_param_is "a"]/a[end]">
 
-	<form class="envchangeuser" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]env[if winix_function_param_is "a"]/a[end]">
-	<fieldset>
-		<legend>{form_env_legend}</legend>
-		
-		<select name="userid">
-			[for env_user_tab]
-				<option value="[env_user_tab_id]" [if env_user_tab_is_current]selected="selected"[end]>[env_user_tab_name]</option>
-			[end]
-		</select>
+		<div class="uk-margin">
+			<label class="uk-form-label" for="winix_env_user_select">
+				[if winix_function_param_is "a"]
+					{env_change_admin_env_for_user}
+				[else]
+					{env_change_env_for_user}
+				[end]
+			</label>
+
+			<div class="uk-form-controls">
+				<select class="uk-select" id="winix_env_user_select" name="userid">
+					[for env_user_tab]
+						<option value="[env_user_tab_id]" [if env_user_tab_is_current]selected="selected"[end]>[env_user_tab_name]</option>
+					[end]
+				</select>
+			</div>
+		</div>
 
 		<input type="hidden" name="changeuser">
-		<input class="submit" type="submit" value="{env_change_user}">
+
+		<div class="uk-margin">
+			<input class="uk-button uk-button-primary" type="submit" value="{env_change_user}">
+		</div>
 
 		[if winix_function_param_is "postredirect"]
 			<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 		[end]
 
-
-	</fieldset>
 	</form>
-	
+
 [end]
 
 
 
 
-<form id="additem" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]env[if winix_function_param_is "a"]/a[end]">
-<fieldset>
-	<legend>{form_env_legend}</legend>
-	
-		<textarea class="multitext" rows="30" cols="60" name="envvar">[if winix_function_param_is "a"][env_user_admin_env_str][else][env_user_env_str][end]</textarea>
-		<input type="hidden" name="userid" value="[env_user_id]">
-		<input class="submit" type="submit" value="{change}">
+<form class="uk-margin-medium uk-form-stacked" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]env[if winix_function_param_is "a"]/a[end]">
 
-		[if winix_function_param_is "postredirect"]
-			<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
-		[end]
+	<div class="uk-margin">
+		<div class="uk-form-controls">
+			<textarea class="uk-textarea" rows="20" name="envvar">[if winix_function_param_is "a"][env_user_admin_env_str][else][env_user_env_str][end]</textarea>
+		</div>
+	</div>
 	
-</fieldset>
+	<input type="hidden" name="userid" value="[env_user_id]">
+
+	<div class="uk-margin">
+		<input class="uk-button uk-button-primary" type="submit" value="{change}">
+	</div>
+
+	[if winix_function_param_is "postredirect"]
+		<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
+	[end]
+
 </form>
 
 

winixd/html/fun_export.html

@@ -11,17 +11,20 @@
 
 
 
-<form action="[doc_base_url][dir][if item_is][item_url]/[end]export" method="post">
+<form class="uk-form-stacked" action="[doc_base_url][dir][if item_is][item_url]/[end]export" method="post">
 
-	<input type="checkbox" name="staticfilestoo" id="nonstaticfiles"><label for="nonstaticfiles">{export_checkbox_static_file_too}</label>
-
-	<br><br>
-	<input type="submit" value="Export">
+	<div class="uk-margin">
+		<label><input class="uk-checkbox uk-margin-small-right" type="checkbox" name="staticfilestoo">{export_checkbox_static_file_too}</label>
+	</div>
 
 	[if winix_function_param_is "postredirect"]
 		<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 	[end]
 
+	<div class="uk-margin">
+		<button class="uk-button uk-button-primary" type="submit">{export_button}</button>
+	</div>
+
 </form>
 
 

winixd/html/fun_gallery.html

@@ -4,12 +4,14 @@
 [if mount_page_arg_is "info"][include "dir_last_info.html"][end]
 
 
-[if one gallery_has_not_mount_type [gallery_mount_type_arg_is "lightbox"]]
+[if one gallery_has_not_mount_type [gallery_mount_type_arg_is "uikit"]]
 
 	[if gallery_tab]
-		<ul class="galleryimages">
+		<ul class="uk-child-width-1-2@s uk-child-width-1-3@m uk-child-width-1-4@l uk-grid" data-uk-lightbox="animation: slide">
 		[for gallery_tab]
-			<li><a rel="lightbox\[gallery\]" href="[gallery_tab_link]"><img src="[gallery_tab_link]/-/thumb" alt="[gallery_tab_subject]"></a></li>
+			<li class="uk-margin-small">
+				<a href="[gallery_tab_link]"><img src="[gallery_tab_link]/-/thumb" alt="[gallery_tab_subject]"></a>
+			</li>
 		[end]
 		</ul>
 	[end]
@@ -17,7 +19,24 @@
 [end]
 
 
-[if gallery_mount_type_arg_is "galleria"]
+[if gallery_mount_type_arg_is "lightbox"]
+[# https://lokeshdhakar.com/projects/lightbox2/ ]
+
+	[if gallery_tab]
+		<ul class="uk-child-width-1-2@s uk-child-width-1-3@m uk-child-width-1-4@l uk-grid">
+		[for gallery_tab]
+			<li class="uk-margin-small">
+				<a href="[gallery_tab_link]" data-lightbox="gallery"><img src="[gallery_tab_link]/-/thumb" alt="[gallery_tab_subject]"></a>
+			</li>
+		[end]
+		</ul>
+	[end]
+
+[end]
+
+
+[if gallery_mount_type_arg_is "galleriajs"]
+[# https://galleriajs.github.io/]
 
 	[if gallery_tab]
 		<ul class="galleryimages" style="width: [gallery_width]; height: [gallery_height];">
@@ -25,21 +44,30 @@
 			<li><a href="[gallery_tab_link]"><img src="[gallery_tab_link]/-/thumb" alt="[gallery_tab_subject]"></a></li>
 		[end]
 		</ul>
-		
-		[if gallery_mount_theme_arg_is "transparent"]
-			<script type="text/javascript">Galleria.loadTheme('[doc_base_url_common]/aino-galleria/themes/transparent/galleria.transparent.js');</script>
+
+
+		[if gallery_mount_theme_arg_is "azur"]
+			<script type="text/javascript">Galleria.loadTheme('[doc_base_url_common]/galleriajs/1.6.1/dist/themes/azur/galleria.azur.min.js');</script>
 		[else]
-			[if gallery_mount_theme_arg_is "white"]
-				<script type="text/javascript">Galleria.loadTheme('[doc_base_url_common]/aino-galleria/themes/white/galleria.white.js');</script>
+			[if gallery_mount_theme_arg_is "twelve"]
+				<script type="text/javascript">Galleria.loadTheme('[doc_base_url_common]/galleriajs/1.6.1/dist/themes/twelve/galleria.twelve.min.js');</script>
 			[else]
-				<script type="text/javascript">Galleria.loadTheme('[doc_base_url_common]/aino-galleria/themes/classic/galleria.classic.js');</script>
+				[if gallery_mount_theme_arg_is "folio"]
+					<script type="text/javascript">Galleria.loadTheme('[doc_base_url_common]/galleriajs/1.6.1/dist/themes/folio/galleria.folio.min.js');</script>
+				[else]
+					[if gallery_mount_theme_arg_is "fullscreen"]
+						<script type="text/javascript">Galleria.loadTheme('[doc_base_url_common]/galleriajs/1.6.1/dist/themes/fullscreen/galleria.fullscreen.min.js');</script>
+					[else]
+						<script type="text/javascript">Galleria.loadTheme('[doc_base_url_common]/galleriajs/1.6.1/dist/themes/classic/galleria.classic.min.js');</script>
+					[end]
+				[else]
 			[end]
 		[end]
 
+
 		[if not [winix_function_param_is "image"]]
 			<script type="text/javascript">$('.galleryimages').galleria();</script>
 		[else]
-			[# !! IMPROVE ME add this javascript code to the rest of galleria types]
 			<script type="text/javascript">var url = window.document.URL.toString(); var num = 0; var re = /\/image:(\d+)/; var numarr = re.exec(url); if( numarr && numarr.length == 2 ) \{var num = numarr\[1\];\}; $('.galleryimages').galleria(\{show: num\});</script>
 		[end]
 	[end]
@@ -47,120 +75,4 @@
 [end]
 
 
-[if gallery_mount_type_arg_is "galleria1.2.9"]
-
-	[if gallery_tab]
-
-		<ul class="galleryimages" style="width: [gallery_width]; height: [gallery_height];">
-		[for gallery_tab]
-			<li><a href="[gallery_tab_link]"><img src="[gallery_tab_link]/-/thumb" alt="[gallery_tab_subject]"></a></li>
-		[end]
-		</ul>
-
-
-		[if gallery_mount_theme_arg_is "transparent"]
-			<script type="text/javascript">Galleria.loadTheme('[doc_base_url_common]/galleria/themes/transparent/galleria.transparent.js');</script>
-
-			[if not [winix_function_param_is "image"]]
-				<script type="text/javascript">Galleria.configure(\{showInfo:false\}); Galleria.run('.galleryimages');</script>
-			[else]
-				<script type="text/javascript">Galleria.configure(\{showInfo:false, show: [winix_function_param_value "image"]\}); Galleria.run('.galleryimages');</script>
-			[end]
-
-		[else]
-			[if gallery_mount_theme_arg_is "transparentinfo"]
-				<script type="text/javascript">Galleria.loadTheme('[doc_base_url_common]/galleria/themes/transparentinfo/galleria.transparent.js');</script>
-
-				[if not [winix_function_param_is "image"]]
-					<script type="text/javascript">Galleria.configure(\{\}); Galleria.run('.galleryimages');</script>
-				[else]
-					<script type="text/javascript">Galleria.configure(\{show: [winix_function_param_value "image"]\}); Galleria.run('.galleryimages');</script>
-				[end]
-			[else]
-				<script type="text/javascript">Galleria.loadTheme('[doc_base_url_common]/galleria/themes/classic/galleria.classic.js');</script>
-
-				[if not [winix_function_param_is "image"]]
-					<script type="text/javascript">Galleria.configure(\{\}); Galleria.run('.galleryimages');</script>
-				[else]
-					<script type="text/javascript">Galleria.configure(\{show: [winix_function_param_value "image"]\}); Galleria.run('.galleryimages');</script>
-				[end]
-			[end]
-		[end]
-	
-	[end]
-
-[end]
-
-
-[if gallery_mount_type_arg_is "galleriathumb"]
-
-	[if not [winix_function_param_is "image"]]
-		[if gallery_tab]
-			<ul class="galleryimages">
-			[for gallery_tab]
-				<li><a href="[doc_base_url][dir]-/image:[gallery_tab_index]"><img src="[gallery_tab_link]/-/thumb" alt="[gallery_tab_subject]"></a></li>
-			[end]
-			</ul>
-		[end]
-	[else]
-		[if gallery_tab]
-			<ul class="galleryimages" style="width: [gallery_width]; height: [gallery_height];">
-			[for gallery_tab]
-				<li><a href="[gallery_tab_link]"><img src="[gallery_tab_link]/-/thumb" alt="[gallery_tab_subject]"></a></li>
-			[end]
-			</ul>
-			
-			[if gallery_mount_theme_arg_is "white"]
-				<script type="text/javascript">Galleria.loadTheme('[doc_base_url_common]/aino-galleria/themes/white/galleria.white.js');</script>
-			[else]
-				<script type="text/javascript">Galleria.loadTheme('[doc_base_url_common]/aino-galleria/themes/classic/galleria.classic.js');</script>
-			[end]
-			
-			<script type="text/javascript">$('.galleryimages').galleria(\{show_info:false, show: [winix_function_param_value "image"]\});</script>
-
-		[end]
-	[end]
-
-[end]
-
-
-
-[if gallery_mount_type_arg_is "galleriathumb1.2.9"]
-
-
-	[if not [winix_function_param_is "image"]]
-		[if gallery_tab]
-			<ul class="galleryimages">
-			[for gallery_tab]
-				<li><a href="[doc_base_url][dir]-/image:[gallery_tab_index]"><img src="[gallery_tab_link]/-/thumb" alt="[gallery_tab_subject]"></a></li>
-			[end]
-			</ul>
-		[end]
-	[else]
-
-		[if gallery_tab]
-
-			<ul class="galleryimages" style="width: [gallery_width]; height: [gallery_height];">
-			[for gallery_tab]
-				<li><a href="[gallery_tab_link]"><img src="[gallery_tab_link]/-/thumb" alt="[gallery_tab_subject]"></a></li>
-			[end]
-			</ul>
-
-			[if gallery_mount_theme_arg_is "transparent"]
-				<script type="text/javascript">Galleria.loadTheme('[doc_base_url_common]/galleria/themes/transparent/galleria.transparent.js');</script>
-				<script type="text/javascript">Galleria.configure(\{showInfo:false, show: [winix_function_param_value "image"]\}); Galleria.run('.galleryimages');</script>
-			[else]
-				[if gallery_mount_theme_arg_is "transparentinfo"]
-					<script type="text/javascript">Galleria.loadTheme('[doc_base_url_common]/galleria/themes/transparentinfo/galleria.transparent.js');</script>
-					<script type="text/javascript">Galleria.configure(\{show: [winix_function_param_value "image"]\}); Galleria.run('.galleryimages');</script>
-				[end]
-			[end]
-		
-		[end]
-
-	[end]
-
-[end]
-
-
 </div>

winixd/html/fun_imgcrop.html

@@ -1,22 +1,22 @@
 <div class="winix">
 
 
-<h1>Kadrowanie obrazów</h1>
+<h1>{imgcrop_header}</h1>
 
 [if item_is]
 
-	[if winix_function_param_is "thumb"]
-	<p>Kadruj miniaturę zdjęcia, obraz oryginalny (duży) nie zostanie zmodyfikowany.</p>.
-	[else]
-		[if winix_function_param_is "newthumb"]
-			<p>Zaznacz myszką kadr na zdjęciu, z tej części zostanie stworzona nowa miniatura, obraz oryginalny (duży) nie zostanie zmodyfikowany.</p>.
-		[else]
-			<p>Kadruj oryginalny obraz (miniatura nie zostanie zmodyfikowana).</p>.
-		[end]
-	[end]
-
 	[if any item_is item_filetype_is_image]
 
+		[if winix_function_param_is "thumb"]
+			<p>{imgcrop_crop_only_thumb_info}</p>
+		[else]
+			[if winix_function_param_is "newthumb"]
+				<p>{imgcrop_create_new_thumb_info}</p>
+			[else]
+				<p>{imgcrop_crop_only_original_img_info}</p>
+			[end]
+		[end]
+
 		<script type="text/javascript">
 		var winix_jcrop;
 		</script>
@@ -31,12 +31,11 @@
 
 			[if any_not [winix_function_param_is "thumb"] [winix_function_param_is "newthumb"]]
 
-	[if false]
-			<div class="winix_input_b">
-				<input type="checkbox" name="createthumbtoo" id="winix_createthumbtooid">
-				<label for="winix_createthumbtooid">Stwórz także nową miniaturę</label>
-			</div>
-	[end]
+				[if false] [# !! IMPROVE ME not implemented yet]
+				<div class="uk-margin">
+					<label><input class="uk-checkbox uk-margin-small-right" type="checkbox" name="createthumbtoo">{imgcrop_create_new_thumb_too_info}</label>
+				</div>
+				[end]
 
 			[end]
 
@@ -44,12 +43,15 @@
 				<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 			[end]
 
-			<input type="submit" value="Kadruj">
+			<div class="uk-margin">
+				<input class="uk-button uk-button-primary" type="submit" value="Kadruj">
+			</div>
+
 		</form>
 
 
 	[else]
-		<p>To nie jest obrazek.</p>
+		<p>{imgcrop_no_image_info}</p>
 	[end]
 
 
@@ -72,33 +74,35 @@
 [else]
 
 	[if item_tab]
-		<ul class="winix_imgcrop_list">
-		[for item_tab]
+		<table class="uk-table uk-table-responsive uk-table-divider uk-table-justify">
+			[for item_tab]
+				<tr>
 
-			<li>
-
-			<div class="winix_imgcrop_list_image">
-				<img src="[item_tab_link][if item_tab_has_thumb]/-/thumb[end]" alt="[item_tab_subject]">
-			</div>
-
-			<div class="winix_imgcrop_list_imageurl">
-				[item_tab_url]
-			</div>
-
-			<div class="winix_imgcrop_list_options">
-
-				<ul>
-					<li><a href="[item_tab_link]/imgcrop/postredirect:[filter fil_urlencode][doc_base_url][dir]imgcrop[end]">Kadruj zdjęcie</a></li>
-					<li><a href="[item_tab_link]/imgcrop/thumb/postredirect:[filter fil_urlencode][doc_base_url][dir]imgcrop[end]">Kadruj miniature</a></li>
-					<li><a href="[item_tab_link]/imgcrop/newthumb/postredirect:[filter fil_urlencode][doc_base_url][dir]imgcrop[end]">Kadruj i stwórz nową miniature</a></li>
-				</ul>
-			</div>
+					<td data-uk-lightbox="animation: slide">
+						<a href="[item_tab_link]">
+							<img src="[item_tab_link][if item_tab_has_thumb]/-/thumb[end]" alt="[item_tab_subject]">
+						</a>
+					</td>
 
 
-			</li>
+					<td>
+						[item_tab_url]
+					</td>
 
-		[end]
-		</ul>
+					<td>
+
+						<ul class="uk-nav uk-width-medium">
+							<li class="uk-margin-small"><a class="uk-button uk-button-default uk-button-small uk-text-small" href="[item_tab_link]/imgcrop/postredirect:[filter fil_urlencode][doc_base_url][dir]imgcrop[end]">{imgcrop_table_option_crop_image}</a></li>
+							<li class="uk-margin-small"><a class="uk-button uk-button-default uk-button-small uk-text-small" href="[item_tab_link]/imgcrop/thumb/postredirect:[filter fil_urlencode][doc_base_url][dir]imgcrop[end]">{imgcrop_table_option_crop_thumb}</a></li>
+							<li class="uk-margin-small"><a class="uk-button uk-button-default uk-button-small uk-text-small" href="[item_tab_link]/imgcrop/newthumb/postredirect:[filter fil_urlencode][doc_base_url][dir]imgcrop[end]">{imgcrop_table_option_create_new_thumb}</a></li>
+						</ul>
+
+					</td>
+
+
+				</tr>
+			[end]
+		</table>
 	[end]
 
 

winixd/html/fun_ipban.html

@@ -4,7 +4,7 @@
 
 [if ipban_tab]
 
-	<table class="ipban_table">
+	<table class="uk-table uk-table-divider uk-table-small">
 
 	<tr>
 		<th>{ipban_col_id}</th>
@@ -35,15 +35,15 @@
 		<td>[if ipban_tab_has_active_flag]{ipban_has_active_flag}[end]</td>
 		<td>[ipban_tab_last_used]</td>
 		<td>[ipban_tab_expires]</td>
-		<td><a href="[doc_base_url][dir][if item_is][item_url]/[end]ipban/removeip:[ipban_tab_ip]">{ipban_remove_ip}</a></td>
+		<td><a class="uk-button uk-button-default uk-button-small" href="[doc_base_url][dir][if item_is][item_url]/[end]ipban/removeip:[ipban_tab_ip]">{ipban_remove_ip}</a></td>
 	</tr>
 
 	[end]
 	</table>
 
-	<p>
-		<a href="[doc_base_url][dir][if item_is][item_url]/[end]ipban/removeip:all">{ipban_remove_all_ip}</a>
-	</p>
+	<div class="uk-margin">
+		<a class="uk-button uk-button-default" href="[doc_base_url][dir][if item_is][item_url]/[end]ipban/removeip:all">{ipban_remove_all_ip}</a>
+	</div>
 
 [else]
 	<p>{ipban_ban_list_empty}</p>

winixd/html/fun_last.html

@@ -1,9 +1,9 @@
 <div class="winix">
 
-<h1 class="simple">{last_header}</h1>
+<h1>{last_header}</h1>
 
 [if last_tab]
-	<table>
+	<table class="uk-table uk-table-divider uk-table-small uk-table-responsive">
 	<tr><th>{last_tab_login}</th><th>{last_tab_ip}</th><th>{last_tab_login_date}</th><th>{last_tab_logout_date}</th></tr>
 	[for last_tab]
 		<tr><td>[last_tab_name]</td><td>[last_tab_ip]</td><td>[last_tab_start]</td><td>[last_tab_end]</td></tr>

winixd/html/fun_ln.html

@@ -2,35 +2,50 @@
 
 <h1>{ln_header}</h1>
 
+<p>{ln_info}: [dir]</p>
 
-<form id="additem" method="post" action="[doc_base_url][dir]ln">
-<fieldset>
-	<legend>{form_ln_legend}</legend>
 
-	<p>{ln_info}: [dir]</p>
+<form class="uk-form-stacked uk-width-1-2@s" method="post" action="[doc_base_url][dir]ln">
 
-	<p class="withnext">{suggested_url}</p>
-	<input class="edit" type="text" name="url" value="">
 
-	<p class="withnext">{ln_to}</p>
-	<input class="edit" type="text" name="linkto" value="[dir][if item_is][item_url][end]">
+	<div class="uk-margin">
+		<label class="uk-form-label" for="winix_suggested_url">{suggested_url}</label>
+
+		<div class="uk-form-controls">
+			<input class="uk-input" id="winix_suggested_url" type="text" name="url" value="">
+		</div>
+	</div>
+
+
+	<div class="uk-margin">
+		<label class="uk-form-label" for="winix_link_to">{ln_to}</label>
+
+		<div class="uk-form-controls">
+			<input class="uk-input" id="winix_link_to" type="text" name="linkto" value="[dir][if item_is][item_url][end]">
+		</div>
+	</div>
+
+
+	<div class="uk-margin-small">
+		<label><input class="uk-radio uk-margin-small-right" type="radio" name="linktype" checked="checked" value="0">{ln_hardlink}</label>
+	</div>
 	
-	<p>
-	<label><input id="radiohard" type="radio" name="linktype" checked="checked" value="0">{ln_hardlink}</label>
-	<label><input id="radiosymb" type="radio" name="linktype" value="1">{ln_symlink}</label>
-	</p>
+	<div class="uk-margin-small">
+		<label><input class="uk-radio uk-margin-small-right" type="radio" name="linktype" value="1">{ln_symlink}</label>
+	</div>
 	
-	<p>
-	<label><input class="" type="checkbox" name="makeredirect">{ln_make_redirect}</label>
-	</p>
+	<div class="uk-margin">
+		<label><input class="uk-checkbox uk-margin-small-right" type="checkbox" name="makeredirect">{ln_make_redirect}</label>
+	</div>
 
 	[if winix_function_param_is "postredirect"]
 		<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 	[end]
 
-	
-	<input class="submit" type="submit" value="{change}">
-</fieldset>
+	<div class="uk-margin">
+		<input class="uk-button uk-button-primary" type="submit" value="{change}">
+	</div>
+
 </form>
 
 

winixd/html/fun_locale.html

@@ -9,26 +9,27 @@
 [end]
 
 
-<form id="additem" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]locale">
-<fieldset>
-	<legend>{locale_form_legend}</legend>
-	
-	<p class="withnext">{locale_select}:</p>
-	
-	[# add to styles]
-	<select name="localeid" style="width: 250px;">
-	[for winix_locale_tab]
-		<option value="[winix_locale_tab_id]" [if cmp user_locale_id winix_locale_tab_id]selected="selected"[end]>[winix_locale_tab_name]</option>
-	[end]
-	</select>
+<form class="uk-form-stacked uk-width-1-2@s" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]locale">
+	<div class="uk-margin">
+		<label class="uk-form-label" for="winix_locale_select">{locale_select}:</label>
 
-	[if winix_function_param_is "postredirect"]
-		<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
-	[end]
+		<div class="uk-form-controls">
+			<select id="winix_locale_select" name="localeid" class="uk-select">
+			[for winix_locale_tab]
+				<option value="[winix_locale_tab_id]" [if cmp user_locale_id winix_locale_tab_id]selected="selected"[end]>[winix_locale_tab_name]</option>
+			[end]
+			</select>
+		</div>
 
+		[if winix_function_param_is "postredirect"]
+			<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
+		[end]
 	
-	<input class="submit" type="submit" value="{change}">
-</fieldset>
+		<div class="uk-margin uk-form-controls">
+			<input class="uk-button uk-button-primary" type="submit" value="{change}">
+		</div>
+
+	</div>
 </form>
 
 

winixd/html/fun_login.html

@@ -1,47 +1,91 @@
 <div class="winix">
 
-<h1>{login_header}</h1>
-
 [if user_logged]
-	<p>{logged_as_long}: [user_name]<br>
-	<a href="[doc_base_url][if dir_can_read_exec][dir][if any item_is item_can_read][item_url]/[end][else]/[end]logout">{logout}</a></p>
+	<div class="uk-width-large uk-padding-small">
+		<h1>{login_header}</h1>
+
+		<p class="uk-margin-top">
+		{login_currently_logged_as} <strong>[user_name]</strong>
+		</p>
+
+		<div class="uk-margin-top">
+			<a href="[doc_base_url][if dir_can_read_exec][dir][if any item_is item_can_read][item_url]/[end][else]/[end]logout" class="uk-button uk-button-primary uk-width-small">{login_logout_button}</a>
+		</div>
+	</div>
 [else]
 
 	[if not ipban_is_login_allowed_from_this_ip]
-		<p>{login_cannot_login_from_this_ip}<br>
-		{login_cannot_login_available} [ipban_current_ip_expires_time]</p>
+		<div class="uk-width-1-1 uk-padding-small uk-alert-danger">
+			<p>{login_cannot_login_from_this_ip}<br>
+			{login_cannot_login_available} [ipban_current_ip_expires_time]</p>
+		</div>
 	[else]
 
-		<form method="post" action="[login_path]login">
+		[# login template: https://zzseba78.github.io/Kick-Off/login.html, a little modified: removed pills from borders ]
+		<div class="uk-width-medium uk-padding-small">
+			<!-- login -->
+			<form class="toggle-class" action="[login_path]login" method="POST">
 
-		<div class="winix_input_b">
-			<input type="text" name="login">
-		</div>
+				<div class="uk-margin-small">
+					<div class="uk-inline uk-width-1-1">
+						<span class="uk-form-icon uk-form-icon-flip" data-uk-icon="icon: user"></span>
+						<input class="uk-input" required placeholder="{login_username}" type="text" name="login">
+					</div>
+				</div>
+				<div class="uk-margin-small">
+					<div class="uk-inline uk-width-1-1">
+						<span class="uk-form-icon uk-form-icon-flip" data-uk-icon="icon: lock"></span>
+						<input class="uk-input" required placeholder="{login_password}" type="password" name="password">
+					</div>
+				</div>
 
-		<div class="winix_input_b">
-			<input type="password" name="password">
-		</div>
+				[if login_should_use_captcha]
+				<div class="uk-margin-small">
+					<div class="uk-inline uk-width-1-1">
+						<span class="uk-form-icon uk-form-icon-flip" data-uk-icon="icon: lifesaver"></span>
+						<input class="uk-input" required placeholder="{rebus_how_is_it} [rebus_question]?" type="text" name="rebus">
+					</div>
+				</div>
+				[end]
 
-		<div class="winix_input_b">
-			<input id="winix_login_rememberme_id" type="checkbox" name="rememberme">
-			<label for="winix_login_rememberme_id">{remember_me}</label>
-		</div>
+				<div class="uk-margin-small">
+					<label><input class="uk-checkbox uk-margin-small-right" type="checkbox" name="rememberme">{login_remember_me}</label>
+				</div>
+				<div class="uk-margin-bottom">
+					<button type="submit" class="uk-button uk-button-primary uk-width-1-1">{login_button}</button>
+				</div>
 
-		[if login_should_use_captcha]
-			<div class="winix_input_a">
-			<label for="winix_rebus_id">{rebus_how_is_it} [rebus_question]?</label>
-			<input id="winix_rebus_id" type="text" name="rebus">
+				[if winix_function_param_is "postredirect"]
+					<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
+				[end]
+
+			</form>
+			<!-- /login -->
+
+
+			<!-- recover password -->
+			<form class="toggle-class" action="#[# not implemented yet]" hidden>
+				<div class="uk-margin-small">
+					<div class="uk-inline uk-width-1-1">
+						<span class="uk-form-icon uk-form-icon-flip" data-uk-icon="icon: mail"></span>
+						<input class="uk-input" placeholder="{login_forgot_password_email}" required type="text">
+					</div>
+				</div>
+				<div class="uk-margin-bottom">
+					<button type="submit" class="uk-button uk-button-primary uk-width-1-1">{login_forgot_password_button}</button>
+				</div>
+			</form>
+			<!-- /recover password -->
+
+			<!-- action buttons -->
+			<div>
+				<div class="uk-text-center">
+					<a class="uk-link-reset uk-text-small toggle-class" data-uk-toggle="target: .toggle-class ;animation: uk-animation-fade">{login_forgot_password_question}</a>
+					<a class="uk-link-reset uk-text-small toggle-class" data-uk-toggle="target: .toggle-class ;animation: uk-animation-fade" hidden><span data-uk-icon="arrow-left"></span> {login_back_to_login_form}</a>
+				</div>
 			</div>
-		[end]
-
-		<input type="submit" value="{button_login}">
-
-		[if winix_function_param_is "postredirect"]
-			<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
-		[end]
-
-
-		</form>
+			<!-- action buttons -->
+		</div>
 
 	[end]
 

winixd/html/fun_ls.html

@@ -1,24 +1,40 @@
-<div class="winix">
-
+<div class="winix"[if winix_function_param_is "ckeditor_browse"] style="padding: 1.5em;"[end]>
 
 
+[# !! IMPROVE ME: move this html code to a ckeditor template]
 [if winix_function_param_is "ckeditor_browse"]
 	<script type="text/javascript">function select(link) \{ window.opener.CKEDITOR.tools.callFunction([ls_ckeditor_funnum_browse], link); window.close(); \} </script>
-	
-	<div id="winix_ls_browse_leftcolumn">
+
+	<div class="uk-margin">
+		<ul class="uk-breadcrumb">
+		[for dir_tab]
+			<li>
+				<a href="[doc_base_url][dir_tab_link]ls/ckeditor_browse/CKEditor:itemcontent/CKEditorFuncNum:[ls_ckeditor_funnum_browse]">
+				[if cmp dir_tab_url ""]
+					[# !! IMPROVE ME it would be better to have a flag of some kind to indicate that this is a root dir]
+					{ls_root_dir_name}
+				[else]
+					[dir_tab_url]
+				[end]
+				</a>
+			</li>
+		[end]
+		</ul>
+	</div>
+
+	<div class="uk-flex uk-margin-medium">
+	<div class="uk-width-1-4">
 	
 		[if dir_childs_tab "with_parent"]
-			<h2>[for dir_tab]<a href="[doc_base_url][dir_tab_link]ls/ckeditor_browse/fullscreen/CKEditor:itemcontent/CKEditorFuncNum:[ls_ckeditor_funnum_browse]">[dir_tab_url]/</a>[end]</h2>
-			
-			<ul>
+			<ul class="uk-list uk-list-disc uk-list-collapse">
 			[for dir_childs_tab "with_parent"]
 				<li>
 				[if dir_childs_is_parent]
 				[# make sure the name of the textarea in fun_ckeditor.html is called: itemcontent]
 				[# is it needed?]
-					<a href="[doc_base_url][dir_parent]ls/ckeditor_browse/fullscreen/CKEditor:itemcontent/CKEditorFuncNum:[ls_ckeditor_funnum_browse]">../</a>
+					<a href="[doc_base_url][dir_parent]ls/ckeditor_browse/CKEditor:itemcontent/CKEditorFuncNum:[ls_ckeditor_funnum_browse]">../</a>
 				[else]
-					<a href="[doc_base_url][dir][dir_childs_tab_url]/ls/ckeditor_browse/fullscreen/CKEditor:itemcontent/CKEditorFuncNum:[ls_ckeditor_funnum_browse]">[dir_childs_tab_url]/</a>
+					<a href="[doc_base_url][dir][dir_childs_tab_url]/ls/ckeditor_browse/CKEditor:itemcontent/CKEditorFuncNum:[ls_ckeditor_funnum_browse]">[dir_childs_tab_url]/</a>
 				[end]
 				</li>
 			[end]
@@ -27,15 +43,14 @@
 
 	</div>
 	
-	<div id="winix_ls_browse_rightcolumn">
+	<div class="">
 		
 		[if item_tab]
-		
-			<h2>{ls_pictures_in_dir} [dir]</h2>
-			<ul>
+
+			<ul class="uk-list uk-list-collapse" data-uk-grid>
 			
 			[for item_tab]
-				<li><a href="javascript:select('[item_tab_link]')"><img src="[item_tab_link]/-/thumb" alt="[item_tab_subject]" height="120"></a></li>
+				<li><a href="javascript:select('[item_tab_link]')"><img data-src="[item_tab_link]/-/thumb" alt="[item_tab_subject]" height="120" data-uk-img></a></li>
 			[end]
 			
 			</ul>
@@ -44,11 +59,12 @@
 		[end]
 
 	</div>
-	
+	</div>
 [else]
 
 	<h1>{ls_header}</h1>
 
+	[# !! improve me: we need a 'l' flag to a file too, now it's working for dirs only]
 	[if not item_is]
 
 		[if winix_function_param_is "l"]
@@ -59,7 +75,15 @@
 
 			[if one dir_childs_tab item_tab]
 
-				<table>
+				<table class="uk-table uk-table-divider uk-table-small uk-table-justify uk-table-responsive">
+				<tr>
+					<th>{ls_type}</th>
+					<th>{ls_permissions}</th>
+					<th>{ls_owner}</th>
+					<th>{ls_group}</th>
+					<th>{ls_name}</th>
+				</tr>
+				
 				[for dir_childs_tab]
 					<tr>
 						<td>d</td>
@@ -95,7 +119,7 @@
 			[dir_childs_tab "with_parent"]
 
 			[if dir_childs_tab]
-				<ul>
+				<ul class="uk-list uk-list-disc uk-list-collapse">
 				[for dir_childs_tab]
 					<li>
 					[if dir_childs_is_parent]
@@ -107,9 +131,9 @@
 				[end]
 				</ul>
 			[end]
-					
+			[# !! IMPROVE ME those two lists (above and below) can be combined together]
 			[if item_tab]
-				<ul>
+				<ul class="uk-list uk-list-disc uk-list-collapse">
 					[for item_tab]
 						<li><a href="[doc_base_url][dir][item_tab_url]">[item_tab_url]</a></li>
 					[end]
@@ -120,8 +144,9 @@
 
 	[else]
 	
-		<ul>
-		<li><a href="[doc_base_url][dir][item_url]">[item_url]</a></li>
+		[#!! improve me: may it would be better to not use a list here?]
+		<ul class="uk-list uk-list-disc uk-list-collapse">
+			<li><a href="[doc_base_url][dir][item_url]">[item_url]</a></li>
 		</ul>
 
 	[end]

winixd/html/fun_man.html

@@ -4,29 +4,23 @@
 
 <h2>{man_winix_funcions}</h2>
 
-<table>
+<ul class="uk-list uk-list-disc">
 
 [for man_winixfun_tab]
-	<tr>
-	<td>[man_winixfun_tab_index]</td>
-	<td>[man_winixfun_tab_name]</td>
-	</tr>
+	<li>[man_winixfun_tab_name]</li>
 [end]
 
-</table>
+</ul>
 
 
 <h2>{man_ezc_functions}</h2>
 
-<table>
+<ul class="uk-list uk-list-disc">
 
 [for man_ezcfun_tab]
-	<tr>
-	<td>[man_ezcfun_tab_index]</td>
-	<td>[man_ezcfun_tab_name]</td>
-	</tr>
+	<li>[man_ezcfun_tab_name]</li>
 [end]
 
-</table>
+</ul>
 
 </div>

winixd/html/fun_meta.html

@@ -1,62 +1,52 @@
 <div class="winix">
 
-[if winix_function_param_is "a"]
-	<h1>{meta_admin_header}</h1>
-
-	[if item_is]
-		<form method="post" action="[doc_base_url][dir][item_url]/meta/a">
-
-			<textarea class="multitext" rows="30" cols="60" name="itemmeta">[item_admin_meta_str]</textarea>
-			<input class="submit" type="submit" value="{change}">
-
-			[if winix_function_param_is "postredirect"]
-				<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
-			[end]
-
-		</form>
+<h1>
+	[if winix_function_param_is "a"]
+		{meta_admin_header}
 	[else]
-		<form method="post" action="[doc_base_url][dir]meta/a">
+		{meta_header}
+	[end]
+</h1>
 
-			<textarea class="multitext" rows="30" cols="60" name="itemmeta">[dir_last_admin_meta_str]</textarea>
-			<input class="submit" type="submit" value="{change}">
 
-			[if winix_function_param_is "postredirect"]
-				<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
+<form class="uk-form-stacked" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]meta[if winix_function_param_is "a"]/a[end]">
+
+	<div class="uk-margin">
+		<label class="uk-form-label" for="winix_meta_textarea">
+		[if winix_function_param_is "a"]
+			[if item_is]
+				{meta_admin_for_page}:
+			[else]
+				{meta_admin_for_dir}:
 			[end]
+		[else]
+			[if item_is]
+				{meta_for_page}:
+			[else]
+				{meta_for_dir}:
+			[end]
+		[end]
 
-		</form>
+		[# !! IMPROVE ME give some message if there is a root directory]
+		[item_url]
+
+		</label>
+
+		<div class="uk-form-controls">
+			<textarea class="uk-textarea" id="winix_meta_textarea" rows="20" name="itemmeta">[if winix_function_param_is "a"][if item_is][item_admin_meta_str][else][dir_last_admin_meta_str][end][else][if item_is][item_meta_str][else][dir_last_meta_str][end][end]</textarea>
+		</div>
+	</div>
+
+	<div class="uk-margin">
+		<input class="uk-button uk-button-primary" type="submit" value="{change}">
+	</div>
+
+	[if winix_function_param_is "postredirect"]
+		<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 	[end]
 
+</form>
 
-[else]
-
-	<h1>{meta_header}</h1>
-
-	[if item_is]
-		<form method="post" action="[doc_base_url][dir][item_url]/meta">
-
-			<textarea class="multitext" rows="30" cols="60" name="itemmeta">[item_meta_str]</textarea>
-			<input class="submit" type="submit" value="{change}">
-
-			[if winix_function_param_is "postredirect"]
-				<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
-			[end]
-
-		</form>
-	[else]
-		<form method="post" action="[doc_base_url][dir]meta">
-
-			<textarea class="multitext" rows="30" cols="60" name="itemmeta">[dir_last_meta_str]</textarea>
-			<input class="submit" type="submit" value="{change}">
-
-			[if winix_function_param_is "postredirect"]
-				<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
-			[end]
-
-		</form>
-	[end]
-
-[end]
 
 
 </div>

winixd/html/fun_mkdir.html

@@ -2,22 +2,33 @@
 
 <h1>{mkdir_header}</h1>
 
+<form class="uk-form-stacked uk-width-1-2@s" method="post" action="[doc_base_url][dir]mkdir">
+
+	<div class="uk-margin">
+		<label class="uk-form-label" for="winix_title">{title}</label>
+
+		<div class="uk-form-controls">
+			<input class="uk-input" id="winix_title" type="text" name="subject" value="">
+		</div>
+	</div>
 
 
-<form id="additem" method="post" action="[doc_base_url][dir]mkdir">
-<fieldset>
-	<legend>{mkdir_form_legend}</legend>
-	<p class="withnext">{title}</p>
-	<input class="edit" type="text" name="subject" value="">
-	<p class="withnext">{suggested_url}</p>
-	<input class="edit" type="text" name="url" value="">
+	<div class="uk-margin">
+		<label class="uk-form-label" for="winix_url">{suggested_url}</label>
+
+		<div class="uk-form-controls">
+			<input class="uk-input" id="winix_url" type="text" name="url" value="">
+		</div>
+	</div>
 
 	[if winix_function_param_is "postredirect"]
 		<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 	[end]
 
-	<input class="submit" type="submit" value="{add}">
-</fieldset>
+	<div class="uk-margin">
+		<input class="uk-button uk-button-primary" type="submit" value="{add}">
+	</div>
+
 </form>
 
 </div>

winixd/html/fun_mount.html

@@ -3,9 +3,12 @@
 <h1>{mount_header}</h1>
 
 
-<h2>{mount_current}:</h2>
+<h2>{mount_current}</h2>
+
+
+
+<table class="uk-table uk-table-divider uk-table-small uk-table-responsive">
 
-<table class="winix_mountpoints">
 	<tr>
 	<th>{mount_type}</th>
 	<th>{mount_dir}</th>
@@ -25,10 +28,11 @@
 
 
 
-<h2>{mount_table}:</h2>
+<h2>{mount_table}</h2>
 
 [if mount_tab]
-<table class="winix_mountpoints">
+<table class="uk-table uk-table-divider uk-table-small uk-table-responsive">
+
 
 	<tr>
 	<th>{mount_type}</th>

winixd/html/fun_mv.html

@@ -2,30 +2,36 @@
 
 <h1>{mv_header}</h1>
 
+<p>
+	[if item_is]{mv_page} [item_url]:[else]{mv_dir} [dir_without_slash][end]
+</p>
 
-<form id="additem" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]mv">
-<fieldset>
-	<legend>{mv_form_legend}</legend>
-	
-	<p>
-	[if item_is]{mv_page} [item_url]:[else]{mv_dir} [dir][end]
-	</p>
-	
-	
-	<p class="withnext">{suggested_url}</p>
-	<input class="edit" type="text" name="dst_path" value="[dir_without_slash][if item_is]/[item_url][end]">
+
+<form class="uk-form-stacked uk-width-1-2@s" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]mv">
+
+	<div class="uk-margin">
+		<label class="uk-form-label" for="winix_url">{suggested_url}</label>
+
+		<div class="uk-form-controls">
+			<input class="uk-input" id="winix_url" type="text" name="dst_path" value="[dir_without_slash][if item_is]/[item_url][end]">
+		</div>
+	</div>
 	
 	
 	[if not item_is]
-	<label><input type="checkbox" name="c"[if winix_function_param_is "c"]checked="checked"[end]>{mv_only_content}</label>
+	<div class="uk-margin">
+		<label><input class="uk-checkbox uk-margin-small-right" type="checkbox" name="c"[if winix_function_param_is "c"] checked="checked"[end]>{mv_only_content}</label>
+	</div>
 	[end]
 
 	[if winix_function_param_is "postredirect"]
 		<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 	[end]
 	
-	<input class="submit" type="submit" value="{move}">
-</fieldset>
+	<div class="uk-margin">
+		<input class="uk-button uk-button-primary" type="submit" value="{move}">
+	</div>
+
 </form>
 
 </div>

winixd/html/fun_nicedit.html

@@ -3,51 +3,57 @@
 [if item_is]<h1>{edit}</h1>[else]<h1>{add}</h1>[end]
 
 
-<form id="additem" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]nicedit">
-<fieldset>
-	<legend>{form_emacs_legend}</legend>
-	
-	[if mount_type_is "cms"]
-		<p class="withnext">{title}:</p>
-		<input class="edit" type="text" name="subject" value="[item_subject]">
-		
-		<p class="withnext">{suggested_url}:</p>
-		<input class="edit" type="text" name="url" value="[item_url]">
+<form class="uk-form-stacked" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]nicedit">
+
+	[if one [mount_type_is "cms"] [any [mount_type_is "thread"] [thread_mount_arg_is "subject"]]]
+	<div class="uk-margin">
+		<label class="uk-form-label" for="winix_title_id">{title}</label>
+		<div class="uk-form-controls">
+			<input class="uk-input" id="winix_title_id" type="text" name="subject" value="[item_subject]" [if not item_is]autofocus [end]>
+		</div>
+	</div>
+
+	<div class="uk-margin">
+		<label class="uk-form-label" for="winix_url_id">{suggested_url}</label>
+		<div class="uk-form-controls">
+			<input class="uk-input" id="winix_url_id" type="text" name="url" value="[item_url]">
+		</div>
+	</div>
 	[end]
+
+	<div class="uk-margin">
+		[if mount_type_is "cms"]<label class="uk-form-label" for="winix_content_id">{form_emacs_content_cms}</label>[end]
+		[if mount_type_is "thread"]<label class="uk-form-label" for="winix_content_id">{form_emacs_content_thread}</label>[end]
+		[if mount_type_is "ticket"]<label class="uk-form-label" for="winix_content_id">{form_emacs_content_ticket}</label>[end]
 	
-	[if any [mount_type_is "thread"] [thread_mount_arg_is "subject"]]
-		<p class="withnext">{title}:</p>
-		<input class="edit" type="text" name="subject" value="[item_subject]">
-		
-		<p class="withnext">{suggested_url}:</p>
-		<input class="edit" type="text" name="url" value="[item_url]">
-	[end]
-	
-	[if mount_type_is "cms"]<p class="withnext">{form_emacs_content_cms}</p>[end]
-	[if mount_type_is "thread"]<p class="withnext">{form_emacs_content_thread}</p>[end]
-	[if mount_type_is "ticket"]<p class="withnext">{form_emacs_content_ticket}</p>[end]
-	
-	<textarea class="multitext" rows="[if mount_type_is "cms"]30[else]10[end]" cols="60" name="itemcontent" id="nicarea">[item_content]</textarea>
-	
-	<input type="hidden" name="contenttype" value="2">
+		<div class="uk-form-controls">
+			<textarea class="uk-textarea" rows="[if mount_type_is "cms"]30[else]10[end]" cols="60" name="itemcontent" id="winix_nicedit">[item_content]</textarea>
+		</div>
+	</div>
 	
+	<div class="uk-form-controls">
+		<input type="hidden" name="contenttype" value="2">
+	</div>
 	
 	<script type="text/javascript">
-	new nicEditor(\{fullPanel:true, iconsPath:'[doc_base_url_common]/nicedit/nicEditorIcons.gif', uploadURI:'[doc_base_url][dir]upload/' \}).panelInstance('nicarea');
+		new nicEditor(\{fullPanel:true, iconsPath:'[doc_base_url_common]/nicedit/0.9_r25/nicEditorIcons.gif', uploadURI:'[doc_base_url][dir]upload/' \}).panelInstance('winix_nicedit');
 	</script>
 	
-	[if winix_function_param_is "full"]
-
-	[else]
-
-	[end]
 	
 	[if not user_logged]
-		<p class="withnext">{nick}:</p>
-		<input class="edit" type="text" name="guestname" value="[item_guest_name]">
-		
-		<p class="withnext">{rebus_how_is_it} [rebus_question]?</p>
-		<input class="edit" type="text" name="rebus">
+		<div class="uk-margin">
+			<label class="uk-form-label" for="winix_nick_id">{nick}</label>
+			<div class="uk-form-controls">
+				<input class="uk-input" id="winix_nick_id" type="text" name="guestname" value="[item_guest_name]">
+			</div>
+		</div>
+
+		<div class="uk-margin">
+			<label class="uk-form-label" for="winix_rebus_id">{rebus_how_is_it} [rebus_question]?</label>
+			<div class="uk-form-controls">
+				<input class="uk-input" id="winix_rebus_id" type="text" name="rebus">
+			</div>
+		</div>
 		
 		[include "antispam.html"]
 	[end]
@@ -56,8 +62,10 @@
 		<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 	[end]
 	
-	<input class="submit" type="submit" value="[if item_is]{change}[else]{add}[end]">
-</fieldset>
+	<div class="uk-margin">
+		<input class="uk-button uk-button-primary" type="submit" value="[if item_is]{change}[else]{add}[end]">
+	</div>
+
 </form>
 
 

winixd/html/fun_passwd.html

@@ -5,63 +5,92 @@
 
 [if winix_function_param_is "resetpassword"]
 
-	<form id="additem" method="post" action="[doc_base_url][dir]passwd/resetpassword">
-	<fieldset>
-		<legend>{passwd_form_legend}</legend>
-		
-		<input type="hidden" name="login" value="[passwd_resetpass_login]">
-		<input type="hidden" name="code" value="[passwd_resetpass_code]">
-		
-		<p class="withnext">{passwd_new_password}:</p>
-		<input class="edit" type="password" name="passwordnew" value="">
+	<form class="uk-form-stacked" method="post" action="[doc_base_url][dir]passwd/resetpassword">
 
-		<p class="withnext">{passwd_confirm_new_password}:</p>
-		<input class="edit" type="password" name="passwordconfirm" value="">
+		<div class="uk-margin">
+			<input type="hidden" name="login" value="[passwd_resetpass_login]">
+			<input type="hidden" name="code" value="[passwd_resetpass_code]">
 
-		<input class="submit" type="submit" value="{passwd_submit}">
+			<div class="uk-margin">
+				<label class="uk-form-label" for="winix_password_new">{passwd_new_password}</label>
 
-		[if winix_function_param_is "postredirect"]
-			<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
-		[end]
+				<div class="uk-form-controls">
+					<input class="uk-input" id="winix_password_new" type="password" name="passwordnew" value="">
+				</div>
+			</div>
 
-	</fieldset>
+			<div class="uk-margin">
+				<label class="uk-form-label" for="winix_password_confirm">{passwd_confirm_new_password}</label>
+
+				<div class="uk-form-controls">
+					<input class="uk-input" id="winix_password_confirm" type="password" name="passwordconfirm" value="">
+				</div>
+			</div>
+
+			<div class="uk-margin">
+				<div class="uk-form-controls">
+					<input class="uk-button uk-button-primary" type="submit" value="{passwd_submit}">
+				</div>
+			</div>
+
+			[if winix_function_param_is "postredirect"]
+				<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
+			[end]
+
+		</div>
 	</form>
 
 [else]
 
-	<form method="post" action="[doc_base_url][dir]passwd">
+	<form class="uk-form-stacked" method="post" action="[doc_base_url][dir]passwd">
 
 		[if user_super_user]
-			<div class="winix_input_a">
-				<label for="winix_users_id">{passwd_login}:</label>
-				<select name="login" id="winix_users_id">
-				[for user_tab]
-					<option [if user_tab_is_current]selected[end]>[user_tab_name]</option>
-				[end]
+			<div class="uk-margin">
+				<label class="uk-form-label" for="winix_user_login">{passwd_login}</label>
+
+				<div class="uk-form-controls">
+					<select class="uk-select" id="winix_user_login" name="login">
+					[for user_tab]
+						<option [if user_tab_is_current]selected[end]>[user_tab_name]</option>
+					[end]
+					</select>
+				</div>
 			</div>
-		</select>
 		[else]
-			<div class="winix_input_a">
-				<label for="winix_current_pass_id">{passwd_current_password}:</label>
-				<input id="winix_current_pass_id" type="password" name="passwordcur" value="">
+			<div class="uk-margin">
+				<label class="uk-form-label" for="winix_current_password">{passwd_current_password}:</label>
+
+				<div class="uk-form-controls">
+					<input class="uk-input" id="winix_current_password" type="password" name="passwordcur" value="">
+				</div>
 			</div>
 		[end]
 		
-		<div class="winix_input_a">
-			<label for="winix_pass_new_id">{passwd_new_password}:</label>
-			<input id="winix_pass_new_id" type="password" name="passwordnew" value="">
+		<div class="uk-margin">
+			<label class="uk-form-label" for="winix_new_password">{passwd_new_password}:</label>
+
+			<div class="uk-form-controls">
+				<input class="uk-input" id="winix_new_password" type="password" name="passwordnew" value="">
+			</div>
 		</div>
 
-		<div class="winix_input_a">
-			<label for="winix_pass_new_confirm_id">{passwd_confirm_new_password}:</label>
-			<input id="winix_pass_new_confirm_id" type="password" name="passwordconfirm" value="">
+		<div class="uk-margin">
+			<label class="uk-form-label" for="winix_new_password_confirm">{passwd_confirm_new_password}:</label>
+
+			<div class="uk-form-controls">
+				<input class="uk-input" id="winix_new_password_confirm" type="password" name="passwordconfirm" value="">
+			</div>
 		</div>
 
 		[if winix_function_param_is "postredirect"]
 			<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 		[end]
 
-		<input type="submit" value="{passwd_submit}">
+		<div class="uk-margin">
+			<div class="uk-form-controls">
+				<input class="uk-button uk-button-primary" type="submit" value="{passwd_submit}">
+			</div>
+		</div>
 
 	</form>
 

winixd/html/fun_priv.html

@@ -2,126 +2,172 @@
 
 [# this template is for following functions: priv, chmod, chown]
 
-
 <h1>{priv_header}</h1>
 
+[if winix_function_param_is "r"]
+	<p>{priv_change_in_dir}: [dir]</p>
+[end]
 
 
 [if not [winix_function_param_is "r"]]
 
-<form id="additem" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end][winix_function]">
-<fieldset>
-	<legend>{priv_form_legend}</legend>
-	
-	<table class="withoutborder">
+<form class="uk-form-stacked uk-width-1-2@s" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end][winix_function]">
 	
 	[if priv_show_form_chown]
-	
-		<tr><th>{user}:</th><td>
-		<select name="user" class="users">
-		[for priv_user_tab]
-			<option[if priv_user_tab_isdefault] selected[end]>[priv_user_tab_name]</option>
-		[end]
-		</select>
-		</td></tr>
-		
-		<tr><th>{group}: </th><td>
-		<select name="group" class="groups">
-		[for priv_group_tab]
-			<option[if priv_group_tab_isdefault] selected[end]>[priv_group_tab_name]</option>
-		[end]
-		</select>
-		</td></tr>
+
+		<div class="uk-margin">
+			<label class="uk-form-label" for="winix_user_select">{user}</label>
+
+			<div class="uk-form-controls">
+				<select class="uk-select" id="winix_user_select" name="user">
+				[for priv_user_tab]
+					<option[if priv_user_tab_isdefault] selected[end]>[priv_user_tab_name]</option>
+				[end]
+				</select>
+			</div>
+		</div>
+
 		
+		<div class="uk-margin">
+			<label class="uk-form-label" for="winix_group_select">{group}</label>
+
+			<div class="uk-form-controls">
+				<select class="uk-select" id="winix_group_select" name="group">
+				[for priv_group_tab]
+					<option[if priv_group_tab_isdefault] selected[end]>[priv_group_tab_name]</option>
+				[end]
+				</select>
+			</div>
+		</div>
+
 	[end]
 		
 	[if priv_show_form_chmod]
-		<tr><th>{permissions}:</th><td><input class="privileges" type="text" name="privileges" value="[priv_privileges]"></td></tr>
+		<div class="uk-margin">
+			<label class="uk-form-label" for="winix_user_permissions">{permissions}</label>
+
+			<div class="uk-form-controls">
+				<input class="uk-input" id="winix_user_permissions" type="text" name="privileges" value="[priv_privileges]">
+			</div>
+		</div>
 	[end]
 		
-	</table>
+
 
 	[if winix_function_param_is "postredirect"]
 		<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 	[end]
 	
-	<input class="submit" type="submit" value="{change}">
-</fieldset>
+	<div class="uk-margin">
+		<input class="uk-button uk-button-primary" type="submit" value="{change}">
+	</div>
+
 </form>
 
 [else]
 
-<form id="additem" method="post" action="[doc_base_url][dir][winix_function]/r">
-<fieldset>
-	<legend>{priv_form_legend}</legend>
-	<p class="withnext">{priv_change_in_dir}: [dir]</p>
+<form class="uk-form-stacked uk-width-1-2@s" method="post" action="[doc_base_url][dir][winix_function]/r">
 	
-	<h2>{priv_for_all_files}:</h2>
-	<table class="withoutborder">
+	<h2>{priv_for_all_files}</h2>
 	
 	[if priv_show_form_chown]
-		<tr><th>{user}:</th><td>
-		<select name="userfile" class="users">
-		[for priv_user_tab]
-			<option[if priv_user_tab_isdefault] selected[end]>[priv_user_tab_name]</option>
-		[end]
-		</select>
-		</td></tr>
+		<div class="uk-margin">
+			<label class="uk-form-label" for="winix_files_user_select">{user}</label>
+
+			<div class="uk-form-controls">
+				<select class="uk-select" id="winix_files_user_select" name="userfile">
+				[for priv_user_tab]
+					<option[if priv_user_tab_isdefault] selected[end]>[priv_user_tab_name]</option>
+				[end]
+				</select>
+			</div>
+		</div>
+
 		
-		<tr><th>{group}: </th><td>
-		<select name="groupfile" class="groups">
-		[for priv_group_tab]
-			<option[if priv_group_tab_isdefault] selected[end]>[priv_group_tab_name]</option>
-		[end]
-		</select>
-		</td></tr>
+		<div class="uk-margin">
+			<label class="uk-form-label" for="winix_files_group_select">{group}</label>
+
+			<div class="uk-form-controls">
+				<select class="uk-select" id="winix_files_group_select" name="groupfile">
+				[for priv_group_tab]
+					<option[if priv_group_tab_isdefault] selected[end]>[priv_group_tab_name]</option>
+				[end]
+				</select>
+			</div>
+		</div>
 	[end]
 	
 	[if priv_show_form_chmod]
-		<tr><th>{permissions}:</th><td><input class="privileges" type="text" name="privilegesfile" value="[priv_privileges_for_files]"></td></tr>
+		<div class="uk-margin">
+			<label class="uk-form-label" for="winix_files_permissions">{permissions}</label>
+
+			<div class="uk-form-controls">
+				<input class="uk-input" id="winix_files_permissions" type="text" name="privilegesfile" value="[priv_privileges_for_files]">
+			</div>
+		</div>
 	[end]
 	
-	</table>
 	
 
-	<h2>{priv_for_all_dirs}:</h2>
-	<table class="withoutborder">
+	<h2>{priv_for_all_dirs}</h2>
 	
 	[if priv_show_form_chown]
-		<tr><th>{user}:</th><td>
-		<select name="userdir" class="users">
-		[for priv_user_tab]
-			<option[if priv_user_tab_isdefault] selected[end]>[priv_user_tab_name]</option>
-		[end]
-		</select>
-		</td></tr>
+		<div class="uk-margin">
+			<label class="uk-form-label" for="winix_dirs_user_select">{user}</label>
+
+			<div class="uk-form-controls">
+				<select class="uk-select" id="winix_dirs_user_select" name="userdir">
+				[for priv_user_tab]
+					<option[if priv_user_tab_isdefault] selected[end]>[priv_user_tab_name]</option>
+				[end]
+				</select>
+			</div>
+		</div>
+
 		
-		<tr><th>{group}: </th><td>
-		<select name="groupdir" class="groups">
-		[for priv_group_tab]
-			<option[if priv_group_tab_isdefault] selected[end]>[priv_group_tab_name]</option>
-		[end]
-		</select>
-		</td></tr>
+		<div class="uk-margin">
+			<label class="uk-form-label" for="winix_dirs_group_select">{group}</label>
+
+			<div class="uk-form-controls">
+				<select class="uk-select" id="winix_dirs_group_select" name="groupdir">
+				[for priv_group_tab]
+					<option[if priv_group_tab_isdefault] selected[end]>[priv_group_tab_name]</option>
+				[end]
+				</select>
+			</div>
+		</div>
 	[end]
 	
 	[if priv_show_form_chmod]
-		<tr><th>{permissions}:</th><td><input class="privileges" type="text" name="privilegesdir" value="[priv_privileges_for_dirs]"></td></tr>
+		<div class="uk-margin">
+			<label class="uk-form-label" for="winix_dirs_permissions">{permissions}</label>
+
+			<div class="uk-form-controls">
+				<input class="uk-input" id="winix_dirs_permissions" type="text" name="privilegesdir" value="[priv_privileges_for_dirs]">
+			</div>
+		</div>
 	[end]
 	
-	
-	</table>
 
-	<label><input class="check" type="checkbox" name="changesubdirs">{priv_change_all}</label>
-	<label><input class="check" type="checkbox" name="changecurrentdir">{priv_change_current_dir}: [dir_without_slash]</label>
+	<div class="uk-margin-medium-top">
+		<div class="uk-form-controls">
+			<label><input class="uk-checkbox uk-margin-small-right" type="checkbox" name="changesubdirs">{priv_change_all}</label>
+		</div>
+
+		<div class="uk-form-controls uk-margin-small-top">
+			[# !! improve me: for root directory dir_without_slash returns nothing, may would be better to show a slash?]
+			<label><input class="uk-checkbox uk-margin-small-right" type="checkbox" name="changecurrentdir">{priv_change_current_dir}: [dir_without_slash]</label>
+		</div>
+	</div>
 
 	[if winix_function_param_is "postredirect"]
 		<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 	[end]
 
-	<input class="submit" type="submit" value="{change}">
+	<div class="uk-margin-medium-top">
+		<input class="uk-button uk-button-primary" type="submit" value="{change}">
+	</div>
 
-</fieldset>
 </form>
 
 [end]

winixd/html/fun_pw.html

@@ -1,9 +1,9 @@
 <div class="winix">
 
-<h1>Pw</h1>
+<h1>{pw_header}</h1>
 
 [if user_tab]
-	<table class="tablec">
+	<table class="uk-table uk-table-divider uk-table-small uk-table-responsive">
 	<tr>
 	<th>{pw_table_no}</th>
 	<th>{pw_table_login}</th>
@@ -14,7 +14,7 @@
 	</tr>
 	
 	[for user_tab]
-		<tr class="[if index "odd"]roweven[else]rowodd[end]">
+		<tr>
 		<td>[user_tab_index]</td>
 		<td>[user_tab_name]</td>
 		<td>[if user_tab_is_super_user]{pw_table_yes}[end]</td>

winixd/html/fun_reply.html

@@ -3,30 +3,37 @@
 <h1>{thread_header_reply}</h1>
 
 
-<form method="post" action="[doc_base_url][dir][item_url]/reply">
+<form class="uk-form-stacked" method="post" action="[doc_base_url][dir][item_url]/reply">
 
 	[if thread_mount_arg_is "subject"]
-		<div class="winix_input_a">
-		<label for="">{title}:</label>
-		<input type="text" name="subject" value="">
+		<div class="uk-margin">
+			<label class="uk-form-label" for="winix_title_id">{title}</label>
+			<div class="uk-form-controls">
+				<input class="uk-input" id="winix_title_id" type="text" name="subject" value="[item_subject]" [if not item_is]autofocus [end]>
+			</div>
 		</div>
 
-		<div class="winix_input_a">
-		<label for="">{suggested_url}:</label>
-		<input type="text" name="url" value="">
+		<div class="uk-margin">
+			<label class="uk-form-label" for="winix_url_id">{suggested_url}</label>
+			<div class="uk-form-controls">
+				<input class="uk-input" id="winix_url_id" type="text" name="url" value="[item_url]">
+			</div>
 		</div>
 	[end]
-	
-	
-	<div class="winix_input_a">
-	[if mount_type_is "thread"]<label for="winix_content_id">{form_emacs_content_thread}</label>[end]
-	<textarea id="winix_content_id" rows="10" cols="60" name="itemcontent"></textarea>
+
+
+	<div class="uk-margin">
+		[if mount_type_is "thread"]<label for="winix_content_id">{form_emacs_content_thread}</label>[end]
+
+		<div class="uk-form-controls">
+			<textarea class="uk-textarea" id="winix_content_id" rows="10" cols="60" name="itemcontent"></textarea>
+		</div>
 	</div>
-	
-	
-	<div class="winix_input_a">
-	<label for="">{form_emacs_content_type}</label>
-	<select name="contenttype">
+
+
+	<div class="uk-margin">
+	<label class="uk-form-label" for="winix_contenttype_id">{form_emacs_content_type}</label>
+	<select class="uk-select" name="contenttype" id="winix_contenttype_id">
 		<option value="0">{form_emacs_content_type_text}</option>
 		<option selected value="1">{form_emacs_content_type_formatted_text}</option>
 		[if user_can_use_html]<option value="2">{form_emacs_content_type_html}</option>[end]
@@ -34,20 +41,24 @@
 		[if user_can_use_other]<option value="4">{form_emacs_content_type_other}</option>[end]
 	</select>
 	</div>
-	
-	
-	
+
+
+
 	[if not user_logged]
-		<div class="winix_input_a">
-		<label for="">{nick}:</label>
-		<input type="text" name="guestname" value="">
+		<div class="uk-margin">
+			<label class="uk-form-label" for="winix_nick_id">{nick}</label>
+			<div class="uk-form-controls">
+				<input class="uk-input" id="winix_nick_id" type="text" name="guestname" value="[item_guest_name]">
+			</div>
 		</div>
-		
-		<div class="winix_input_a">
-		<label for="">{rebus_how_is_it} [rebus_question]?</p>
-		<input type="text" name="rebus">
+
+		<div class="uk-margin">
+			<label class="uk-form-label" for="winix_rebus_id">{rebus_how_is_it} [rebus_question]?</label>
+			<div class="uk-form-controls">
+				<input class="uk-input" id="winix_rebus_id" type="text" name="rebus">
+			</div>
 		</div>
-		
+
 		[include "antispam.html"]
 	[end]
 
@@ -55,8 +66,10 @@
 		<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 	[end]
 
-	
-	<input type="submit" value="{add}">
+
+	<div class="uk-margin">
+		<input class="uk-button uk-button-primary" type="submit" value="{add}">
+	</div>
 
 </form>
 

winixd/html/fun_rm.html

@@ -2,44 +2,44 @@
 
 <h1>{rm_header}</h1>
 
-<form id="additem" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]rm[if not item_is]/r[end]">
-<fieldset>
-	<legend>{rm_form_legend}</legend>
-	
-	<p>
-	[if item_is]
-	
-		[if item_type_is_symlink]
-			{rm_symlink}: [dir][item_url]
-		[else]
-			{rm_file}: [dir][item_url]
-		[end]
-		
-	[else]
-	
-		[if dir_is_root]
-			{rm_root}
-		[else]
-			{rm_dir}: [dir_without_slash]
-		[end]
-		
-	[end]
-	</p>
+<p>
+[if item_is]
 
+	[if item_type_is_symlink]
+		{rm_symlink}: [dir][item_url]
+	[else]
+		{rm_file}: [dir][item_url]
+	[end]
+	
+[else]
+
+	[if dir_is_root]
+		[# !! IMPROVE ME for root dir one has to privide 'c' parameter in order to show the form]
+		{rm_root}
+	[else]
+		{rm_dir}: [dir_without_slash]
+	[end]
+	
+[end]
+</p>
+
+
+
+<form class="uk-form-stacked" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]rm[if not item_is]/r[end]">
 	
 	[if not item_is]
-	<p>
-	<label><input type="checkbox" name="c" [if winix_function_param_is "c"]checked="checked"[end]>{rm_only_content}</label>
-	</p>
+		<label><input class="uk-checkbox uk-margin-small-right" type="checkbox" name="c" [if winix_function_param_is "c"]checked="checked"[end]>{rm_only_content}</label>
 	[end]
 
 	[if winix_function_param_is "postredirect"]
 		<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 	[end]
 	
-	<input class="submit" type="submit" value="{rm_submit}">
+	<div class="uk-margin">
+		<input class="uk-button uk-button-primary" type="submit" value="{rm_submit}">
+	</div>
 	
-</fieldset>
+
 </form>
 
 </div>

winixd/html/fun_rmuser.html

@@ -4,18 +4,20 @@
 
 [if user_logged]
 
-	<form id="additem" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]rmuser">
-	<fieldset>
-		<legend>{rmuser_legend}</legend>
+	<form class="uk-form-stacked" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]rmuser">
 
 		[if user_super_user]
 
-			<p class="withnext">{rmuser_selectuser}:</p>
-			<select name="userid">
-			[for user_tab]
-				<option value="[user_tab_id]">[user_tab_name]</option>
-			[end]
-			</select>
+			<div class="uk-margin">
+				<label class="uk-form-label" for="winix_select_user_id">{rmuser_selectuser}</label>
+				<div class="uk-form-controls">
+					<select class="uk-select uk-width-1-2@s" id="winix_select_user_id" name="userid">
+					[for user_tab]
+						<option value="[user_tab_id]">[user_tab_name]</option>
+					[end]
+					</select>
+				</div>
+			</div>
 		
 		[else]
 			<p>{rmuser_removecurrent}</p>
@@ -26,8 +28,10 @@
 			<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 		[end]
 		
-		<input type="submit" value="{rmuser_submit}">
-	</fieldset>
+		<div class="uk-margin">
+			<input class="uk-button uk-button-primary" type="submit" value="{rmuser_submit}">
+		</div>
+
 	</form>
 
 [end]

winixd/html/fun_run.html

@@ -3,15 +3,7 @@
 	<div>
 	
 		[if mount_page_arg_is "subject"]
-			[if mount_page_arg_is "info"]
-				<h1 class="withinfo">
-			[else]
-				<h1>
-			[end]
-			
-			[item_subject]
-			</h1>
-			
+			<h1>[item_subject]</h1>
 		[end]
 		
 		[if mount_page_arg_is "info"]

winixd/html/fun_seo.html

@@ -0,0 +1,40 @@
+<div class="winix">
+
+<h1>{seo_title}</h1>
+
+
+<form class="uk-form-stacked" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]seo">
+	
+	<div class="uk-margin">
+		<label class="uk-form-label" for="winix_title_id">{title}</label>
+		<div class="uk-form-controls">
+			<input class="uk-input" id="winix_title_id" type="text" name="subject" value="[item_subject]" autofocus>
+		</div>
+	</div>
+
+	<div class="uk-margin">
+		<label class="uk-form-label" for="winix_description_id">{seo_description}</label>
+		<div class="uk-form-controls">
+			<input class="uk-input" id="winix_description_id" type="text" name="description" value="[item_meta "seo" "description"]">
+		</div>
+	</div>
+
+	<div class="uk-margin">
+		<label class="uk-form-label" for="winix_keywords_id">{seo_keywords}</label>
+		<div class="uk-form-controls">
+			<input class="uk-input" id="winix_keywords_id" type="text" name="keywords" value="[item_meta "seo" "keywords"]">
+		</div>
+	</div>
+
+	[if winix_function_param_is "postredirect"]
+		<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
+	[end]
+	
+	<div class="uk-margin">
+		<input class="uk-button uk-button-primary" type="submit" value="{change}">
+	</div>
+
+</form>
+
+
+</div>

winixd/html/fun_showthreads.html

@@ -5,22 +5,20 @@
 
 
 [if thread_can_create]
-	<div class="winix_itemoptions_b">
-	<ul>
-		<li><a href="[doc_base_url][dir]createthread" rel="nofollow">{thread_create_new}</a></li>
-	</ul>
+	<div class="uk-margin">
+		<a class="uk-button uk-button-primary" href="[doc_base_url][dir]createthread" rel="nofollow">{thread_create_new}</a>
 	</div>
 [end]
 
 
 [if thread_sort_tab]
-	<table class="winix_forum">
+	<table class="uk-table uk-table-divider uk-table-small uk-table-responsive">
 	<tr><th>{thread_tab_title}</th><th>{thread_tab_author}</th><th>{thread_tab_replies}</th><th>{thread_tab_last_post}</th></tr>
 	[for thread_sort_tab]
 		<tr>
 		<td><a href="[doc_base_url][dir][thread_sort_tab_url]">[thread_sort_tab_subject]</a></td> [# dodac sprawdzanie subject empty]
-		<td class="smallfont">[thread_sort_tab_user]</td><td class="smallfont">[thread_sort_tab_replies]</td>
-		<td class="smallfont">[thread_sort_tab_last_item_date_modification_nice] ([thread_sort_tab_last_item_user])</td>
+		<td>[thread_sort_tab_user]</td><td class="smallfont">[thread_sort_tab_replies]</td>
+		<td>[thread_sort_tab_last_item_date_modification_nice] ([thread_sort_tab_last_item_user])</td>
 		</tr>
 	[end]
 	</table>

winixd/html/fun_showtickets.html

@@ -5,16 +5,15 @@
 
 
 [if ticket_can_create]
-	<div class="winix_itemoptions_b">
-		<ul>
-		<li><a href="[doc_base_url][dir]createticket" rel="nofollow">{ticket_create_new}</a></li>
-		</ul>
+	<div class="uk-margin">
+		<a class="uk-button uk-button-primary" href="[doc_base_url][dir]createticket" rel="nofollow">{ticket_create_new}</a>
 	</div>
 [end]
 
 
 [if tickets_tab]
-	<table class="winix_tickets_tab">
+<div class="uk-overflow-auto">
+	<table class="uk-table uk-table-divider uk-table-small uk-table-responsive uk-text-small">
 	
 	<tr>
 		<th>{tickets_header_name}</th>
@@ -33,7 +32,7 @@
 	
 	[for tickets_tab]
 		<tr>
-		<td class="winix_tickets_tab_title"><a href="[doc_base_url][dir][tickets_tab_url]">[if not tickets_tab_subject_empty][tickets_tab_subject][else]&lt;[tickets_tab_url]&gt;[end]</a></td>
+		<td><a href="[doc_base_url][dir][tickets_tab_url]">[if not tickets_tab_subject_empty][tickets_tab_subject][else]&lt;[tickets_tab_url]&gt;[end]</a></td>
 		[for tickets_tab_conf_tab]
 			[if any_not [tickets_tab_conf_tab_type_is "images"] [tickets_tab_conf_tab_type_is "files"]]
 				[if tickets_tab_conf_tab_type_is "progress"]
@@ -54,6 +53,7 @@
 	[end]
 	
 	</table>
+</div>
 [end]
 
 

winixd/html/fun_sort.html

@@ -1,54 +1,71 @@
-<div class="winix">
-
-<h1>{sort_header}</h1>
-
-
-[if item_is]
-
-
-
-	<form class="winix_sortable_form" action="[doc_base_url][dir][item_url]/sort" method="post">
-
-		<div class="winix_input_b">
-			<label for="">{sort_current_sortindex}:</p>
-			<input type="text" name="sortindex" value="[item_sort]">
-		</div>
-
-		<input type="submit" value="{change}">
-
-		[if winix_function_param_is "postredirect"]
-			<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
-		[end]
-
-	</form>
-
-[else]
-
-	<p>{sort_info_multi}</p>
-
-	[if item_tab]
-	<form class="winix_sortable_form" action="[doc_base_url][dir]sort" method="post">
-		<ul id="winix_sort_items">
-		[for item_tab]
-			<li id="winix_sort_item_[item_tab_index]">
-			<input type="text" name="sort[item_tab_id]" value="[item_tab_sort]">
-
-			[# is it correct? may give this 'if' only to /-/thumb param? ]
-			[if item_tab_has_thumb]<img src="[item_tab_link]/-/thumb" alt="[item_tab_subject]">[end]
-
-			[item_tab_url] [if not [is item_tab_subject ""]]<span class="winix_sort_item_title">({sort_item_subject}: [item_tab_subject])</span>[end]
-			</li>
-		[end]
-		</ul>
-
-		[if winix_function_param_is "postredirect"]
-			<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
-		[end]
-
-		<input type="submit" value="{change}">
-	</form>
-	[end]
-
-[end]
-
-</div>
+<div class="winix">
+
+<h1>{sort_header}</h1>
+
+
+[if item_is]
+
+	<form class="uk-form-stacked" id="winix_sortable_form" action="[doc_base_url][dir][item_url]/sort" method="post">
+
+		<div class="uk-margin">
+			<label class="uk-form-label" for="winix_sort_index">{sort_current_sortindex}</label>
+			<div class="uk-form-controls">
+				<input class="uk-input" id="winix_sort_index" type="text" name="sortindex" value="[item_sort]">
+			</div>
+		</div>
+
+		<div class="uk-margin">
+			<input class="uk-button uk-button-primary" type="submit" value="{change}">
+		</div>
+
+		[if winix_function_param_is "postredirect"]
+			<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
+		[end]
+
+	</form>
+
+[else]
+
+	<p>
+		[if winix_function_param_is "index"]
+			{sort_info_multi_index}
+		[else]
+			{sort_info_multi}
+		[end]
+	</p>
+
+	[if item_tab]
+	<form class="uk-form-stacked" id="winix_sortable_form" action="[doc_base_url][dir]sort" method="post">
+		<ul class="uk-list" id="winix_sort_items" data-uk-sortable>
+		[for item_tab]
+			<li class="uk-tile uk-tile-muted uk-padding-small uk-padding-remove-top uk-padding-remove-bottom" id="winix_sort_item_[item_tab_index]" style="cursor: move;">
+				<input class="[if not [winix_function_param_is "index"]]uk-hidden [end]uk-input uk-width-1-6 uk-margin-small-right" type="text" name="sort[item_tab_id]" value="[item_tab_sort]">
+
+				[# is it correct? may give this 'if' only to /-/thumb param? ]
+				[if item_tab_has_thumb]<img src="[item_tab_link]/-/thumb" alt="[item_tab_subject]">[end]
+
+				[item_tab_url][if item_tab_type_is_dir]/[end] [if not [is item_tab_subject ""]]<span class="uk-text-meta">({sort_item_subject}: [item_tab_subject])</span>[end]
+			</li>
+		[end]
+		</ul>
+
+		[if winix_function_param_is "postredirect"]
+			<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
+		[end]
+
+		[if winix_function_param_is "index"]
+			<div class="uk-margin">
+				<button class="uk-button uk-button-default auk-button-primary" type="button" id="winix_sort_renumerate">renumeruj</button>
+			</div>
+		[end]
+
+		<div class="uk-margin">
+			<input class="uk-button uk-button-primary" type="submit" value="{change}">
+		</div>
+
+	</form>
+	[end]
+
+[end]
+
+</div>

winixd/html/fun_stat.html

@@ -2,7 +2,7 @@
 
 <h1 class="simple">{stat_header}</h1>
 
-<table class="withoutborder">
+<table class="uk-table uk-table-small uk-table-divider uk-width-1-2@m">
 
 <tr><th>{stat_item_type}:</th>	<td>
 [if stat_item_type_is_file]{stat_item_type_file}[end]

winixd/html/fun_subject.html

@@ -3,18 +3,22 @@
 <h1>{subject_header}</h1>
 
 
-<form method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]subject">
+<form class="uk-form-stacked" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]subject">
 	
-	<div class="winix_input_a">
-	<label for="winix_title_id">{title}</label>
-	<input id="winix_title_id" type="text" name="subject" value="[if item_is][item_subject][else][dir_last_subject][end]">
+	<div class="uk-margin">
+		<label class="uk-form-label" for="winix_title_id">{title}</label>
+		<div class="uk-form-controls">
+			<input class="uk-input" id="winix_title_id" type="text" name="subject" value="[if item_is][item_subject][else][dir_last_subject][end]">
+		</div>
 	</div>
 
 	[if winix_function_param_is "postredirect"]
 		<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 	[end]
 	
-	<input class="submit" type="submit" value="{change}">
+	<div class="uk-margin">
+		<input class="uk-button uk-button-primary" type="submit" value="{change}">
+	</div>
 
 </form>
 

winixd/html/fun_template.html

@@ -44,28 +44,33 @@
 
 
 
-<form id="additem" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]template">
-<fieldset>
-	<legend>{template_form_legend}</legend>
-	
-	{template_form_info}:
-	
-	<select name="template" class="template">
-	
-	[# the first should be an empty string (value="") which means: a first template from the mount point]
-	<option value="-1">({template_form_from_mount_point})</option>
-	
-	[for template_tab]
-		<option value="[template_tab_index]"[if template_tab_isdefault] selected[end]>[template_tab_file_name]</option>
-	[end]
-	</select>
+<form class="uk-form-stacked uk-width-1-2@s" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]template">
+
+
+	<div class="uk-margin">
+		<label class="uk-form-label" for="winix_select_template">{template_form_info}</label>
+
+		<div class="uk-form-controls">
+			<select class="uk-select" id="winix_select_template" name="template">
+
+			[# the first should be an empty string (value="") which means: a first template from the mount point]
+			<option value="-1">({template_form_from_mount_point})</option>
+
+			[for template_tab]
+				<option value="[template_tab_index]"[if template_tab_isdefault] selected[end]>[template_tab_file_name]</option>
+			[end]
+			</select>
+		</div>
+	</div>
 
 	[if winix_function_param_is "postredirect"]
 		<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 	[end]
 	
-	<input class="submit" type="submit" value="{change}">
-</fieldset>
+	<div class="uk-margin">
+		<input class="uk-button uk-button-primary" type="submit" value="{change}">
+	</div>
+
 </form>
 
 

winixd/html/fun_thread.html

@@ -1,45 +1,56 @@
 <div class="winix">
 
 [if mount_page_arg_is "subject"]<h1[if mount_page_arg_is "info"] class="winix_withinfo"[end]>[item_subject]</h1>[end]
+[if false]
 [if mount_page_arg_is "info"][include "item_info.html"][end]
-
-
-[if thread_can_reply]
-	<div class="winix_itemoptions_b">
-	<ul>
-		<li><a href="[doc_base_url][dir][item_url]/reply" rel="nofollow">{thread_reply_in_this_thread}</a></li>
-	</ul>
-	</div>
 [end]
 
 [if not [thread_mount_arg_is "sort_desc"]]
-	<div class="winix_threadbox">
-		[if item_can_write]<a class="winix_threadedit" href="[item_link]/emacs" rel="nofollow">\[{edit}\]</a>[end]
+	<div class="uk-margin">
+		[if item_can_write]<a class="uk-button uk-button-default uk-button-small" href="[item_link]/emacs" rel="nofollow">{edit}</a>[end]
 		[if thread_mount_arg_is "subject"]<h2[if thread_mount_arg_is "info"] class="winix_withinfo"[end]>[item_subject]</h2>[end]
 		[if thread_mount_arg_is "info"][include "item_info.html"][end]
 		[item_print_content]
 	</div>
 [end]
 
+[if thread_mount_arg_is "sort_desc"]
+	[if thread_can_reply]
+		<div class="uk-margin">
+			<a class="uk-button uk-button-primary" href="[doc_base_url][dir][item_url]/reply" rel="nofollow">{thread_reply_in_this_thread}</a>
+		</div>
+	[end]
+[end]
+
 
 [for thread_sort_tab]
-	<div class="winix_threadbox[if index "even"] winix_threadboxcolor[end]">
-		[if thread_sort_tab_can_write]<a class="winix_threadedit" href="[thread_sort_tab_link]/emacs" rel="nofollow">\[{edit}\]</a>[end]
+	<div class="uk-margin [if index "odd"]uk-tile-default[else]uk-tile-muted uk-padding-small[end]">
+		[if thread_sort_tab_can_write]<a class="uk-button uk-button-default uk-button-small" href="[thread_sort_tab_link]/emacs" rel="nofollow">{edit}</a>[end]
 		[if thread_mount_arg_is "subject"]<h2[if thread_mount_arg_is "info"] class="winix_withinfo"[end]>[thread_sort_tab_subject]</h2>[end]
 		[if thread_mount_arg_is "info"][include "thread_sort_tab_info.html"][end]
 		[thread_sort_tab_print_content]
 	</div>
 [end]
 
+
+
+
 [if thread_mount_arg_is "sort_desc"]
-	<div class="winix_threadbox">
-		[if item_can_write]<a class="winix_threadedit" href="[item_link]/emacs" rel="nofollow">\[{edit}\]</a>[end]
+	<div class="uk-margin">
+		[if item_can_write]<a class="uk-button uk-button-default uk-button-small" href="[item_link]/emacs" rel="nofollow">{edit}</a>[end]
 		[if thread_mount_arg_is "subject"]<h2[if thread_mount_arg_is "info"] class="winix_withinfo"[end]>[item_subject]</h2>[end]
 		[if thread_mount_arg_is "info"][include "item_info.html"][end]
 		[item_print_content]
 	</div>
 [end]
 
+[if not [thread_mount_arg_is "sort_desc"]]
+	[if thread_can_reply]
+		<div class="uk-margin">
+			<a class="uk-button uk-button-primary" href="[doc_base_url][dir][item_url]/reply" rel="nofollow">{thread_reply_in_this_thread}</a>
+		</div>
+	[end]
+[end]
 
 </div>
 

winixd/html/fun_ticket.html

@@ -5,22 +5,24 @@
 
 
 
-<div class="winix_ticket">
+<div class="uk-section uk-section-muted uk-padding">
 	[if ticket_can_edit]<p class="winix_ticket_edit"><a href="[doc_base_url][dir][item_url]/editticket" rel="nofollow">\[{edit}\]</a></p>[end]
-	<table>
+	<table class="uk-table uk-table-small">
 		[for ticket_tab]
 		[if ticket_tab_has_value]
 
 			<tr>
-			<th>[filter fil_firstup][ticket_tab_param_name]:[end]</th>
-			<td>
+			<th class="uk-width-auto">[filter fil_firstup][ticket_tab_param_name]:[end]</th>
+			<td class="uk-width-expand">
 			
 				[if ticket_tab_type_is "images"]
-					[for ticket_tab_file_tab]
-					<a href="[doc_base_url][ticket_tab_file_tab_path]" rel="lightbox\[a\]">
-					<img src="[doc_base_url][ticket_tab_file_tab_path]/-/thumb" alt="[ticket_tab_file_tab_path]" height="150">
-					</a>
-					[end]
+					<div class="uk-child-width-1-3@m" uk-grid uk-lightbox="animation: slide">
+						[for ticket_tab_file_tab]
+						<a class="uk-inline" href="[doc_base_url][ticket_tab_file_tab_path]" data-caption="[ticket_tab_file_tab_path]">
+							<img src="[doc_base_url][ticket_tab_file_tab_path]/-/thumb" alt="[ticket_tab_file_tab_path]">
+						</a>
+						[end]
+					</div>
 				[end]
 		
 				[if ticket_tab_type_is "files"]
@@ -47,16 +49,9 @@
 
 
 [if winix_has_plugin "thread"]
-
-	[if thread_can_reply]
-		<ul class="winix_itemoptions_b">
-			<li><a href="[doc_base_url][dir][item_url]/reply" rel="nofollow">{thread_reply_in_this_thread}</a></li>
-		</ul>
-	[end]
-	
 	
 	[for thread_sort_tab]
-		<div class="threadbox[if index "odd"] threadboxcolor[end]">
+		<div class="uk-margin [if index "even"]uk-tile-default[else]uk-tile-muted uk-padding-small[end]">
 			[if thread_sort_tab_can_write]<a class="threadedit" href="[thread_sort_tab_link]/emacs" rel="nofollow">\[{edit}\]</a>[end]
 			[if thread_mount_arg_is "subject"]<h2[if thread_mount_arg_is "info"] class="withinfo"[end]>[thread_sort_tab_subject]</h2>[end]
 			[if thread_mount_arg_is "info"][include "thread_sort_tab_info.html"][end]
@@ -64,6 +59,12 @@
 		</div>
 	[end]
 
+	[if thread_can_reply]
+		<div class="uk-margin">
+			<a class="uk-button uk-button-primary" href="[doc_base_url][dir][item_url]/reply" rel="nofollow">{thread_reply_in_this_thread}</a>
+		</div>
+	[end]
+
 [end]
 
 

winixd/html/fun_timezone.html

@@ -9,25 +9,26 @@
 [end]
 
 
-<form id="additem" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]timezone">
-<fieldset>
-	<legend>{timezone_form_legend}</legend>
-	
-	<p class="withnext">{timezone_select}:</p>
-	
-	[# add to styles]
-	<select name="timezoneid" style="width: 250px;">
-	[for winix_tz_tab]
-		<option value="[winix_tz_tab_id]" [if cmp user_time_zone_id winix_tz_tab_id]selected="selected"[end]>UTC[winix_tz_tab_offset_hour_min] [winix_tz_tab_name]</option>
-	[end]
-	</select>
+<form class="uk-form-stacked" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]timezone">
+	<div class="uk-margin">
+		<label class="uk-form-label" for="winix_timezone_select">{timezone_select}:</label>
 
-	[if winix_function_param_is "postredirect"]
-		<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
-	[end]
+		<div class="uk-form-controls">
+			<select id="winix_timezone_select" name="timezoneid" class="uk-select">
+			[for winix_tz_tab]
+				<option value="[winix_tz_tab_id]" [if cmp user_time_zone_id winix_tz_tab_id]selected="selected"[end]>UTC[winix_tz_tab_offset_hour_min] [winix_tz_tab_name]</option>
+			[end]
+			</select>
+		</div>
+
+		[if winix_function_param_is "postredirect"]
+			<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
+		[end]
 	
-	<input class="submit" type="submit" value="{change}">
-</fieldset>
+		<div class="uk-margin uk-form-controls">
+			<input class="uk-button uk-button-primary" type="submit" value="{change}">
+		</div>
+	</div>
 </form>
 
 

winixd/html/fun_tinymce.html

@@ -2,43 +2,52 @@
 
 [if item_is]<h1>{edit}</h1>[else]<h1>{add}</h1>[end]
 
+<form class="uk-form-stacked">
 
+	[if one [mount_type_is "cms"] [any [mount_type_is "thread"] [thread_mount_arg_is "subject"]]]
+	<div class="uk-margin">
+		<label class="uk-form-label" for="winix_title_id">{title}</label>
+		<div class="uk-form-controls">
+			<input class="uk-input" id="winix_title_id" type="text" name="subject" value="[item_subject]" [if not item_is]autofocus [end]>
+		</div>
+	</div>
 
-<form id="additem" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]tinymce">
-<fieldset>
-	<legend>{form_emacs_legend}</legend>
-	
-	[if mount_type_is "cms"]
-		<p class="withnext">{title}:</p>
-		<input class="edit" type="text" name="subject" value="[item_subject]">
-		
-		<p class="withnext">{suggested_url}:</p>
-		<input class="edit" type="text" name="url" value="[item_url]">
+	<div class="uk-margin">
+		<label class="uk-form-label" for="winix_url_id">{suggested_url}</label>
+		<div class="uk-form-controls">
+			<input class="uk-input" id="winix_url_id" type="text" name="url" value="[item_url]">
+		</div>
+	</div>
 	[end]
 	
-	[if any [mount_type_is "thread"] [thread_mount_arg_is "subject"]]
-		<p class="withnext">{title}:</p>
-		<input class="edit" type="text" name="subject" value="[item_subject]">
-		
-		<p class="withnext">{suggested_url}:</p>
-		<input class="edit" type="text" name="url" value="[item_url]">
-	[end]
+	<div class="uk-margin">
+	[if mount_type_is "cms"]<label class="uk-form-label" for="winix_content_id">{form_emacs_content_cms}</label>[end]
+	[if mount_type_is "thread"]<label class="uk-form-label" for="winix_content_id">{form_emacs_content_thread}</label>[end]
+	[if mount_type_is "ticket"]<label class="uk-form-label" for="winix_content_id">{form_emacs_content_ticket}</label>[end]
 	
-
-	[if mount_type_is "cms"]<p class="withnext">{form_emacs_content_cms}</p>[end]
-	[if mount_type_is "thread"]<p class="withnext">{form_emacs_content_thread}</p>[end]
-	[if mount_type_is "ticket"]<p class="withnext">{form_emacs_content_ticket}</p>[end]
+	<div class="uk-form-controls">
+		<div style="border-top: 1px solid #dadada; border-bottom: 1px solid #dadada; padding: 0.2em 0 0.2em 0; margin: 1em 0 1em 0;" id="winix-editor-content" data-winix-post-name="itemcontent">[item_print_content]</div>
+	</div>
+	</div>
 	
-	<textarea class="multitext" rows="[if mount_type_is "cms"]30[else]10[end]" cols="60" name="itemcontent">[item_content]</textarea>
-	
-	<input type="hidden" name="contenttype" value="2">
+	<div class="uk-form-controls">
+		<input id="contenttype" type="hidden" name="contenttype" value="2">
+	</div>
 	
 	[if not user_logged]
-		<p class="withnext">{nick}:</p>
-		<input class="edit" type="text" name="guestname" value="[item_guest_name]">
-		
-		<p class="withnext">{rebus_how_is_it} [rebus_question]?</p>
-		<input class="edit" type="text" name="rebus">
+		<div class="uk-margin">
+			<label class="uk-form-label" for="winix_nick_id">{nick}</label>
+			<div class="uk-form-controls">
+				<input class="uk-input" id="winix_nick_id" type="text" name="guestname" value="[item_guest_name]">
+			</div>
+		</div>
+
+		<div class="uk-margin">
+			<label class="uk-form-label" for="winix_rebus_id">{rebus_how_is_it} [rebus_question]?</label>
+			<div class="uk-form-controls">
+				<input class="uk-input" id="winix_rebus_id" type="text" name="rebus">
+			</div>
+		</div>
 	
 		[include "antispam.html"]
 	[end]
@@ -47,8 +56,35 @@
 		<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 	[end]
 	
-	<input class="submit" type="submit" value="[if item_is]{change}[else]{add}[end]">
-</fieldset>
+	<div class="uk-margin">
+		<div class="uk-form-controls uk-inline">
+
+			<button class="uk-button uk-button-primary winix_update_button"
+				data-winix-function-path="[doc_base_url][dir][if item_is][item_url]/[end]tinymce"
+				data-winix-content-tinymce-instances="winix-editor-content"
+				data-winix-content-inputs="winix_url_id,winix_title_id,contenttype"
+				data-winix-progressbar-id="winix-editor-progressbar"
+				data-winix-messages-status-success-id="winix-editor-messages-status-success"
+				data-winix-messages-status-error-id="winix-editor-messages-status-error"
+				>
+				{tinymce_update_button}
+			</button>
+
+			<div id="winix-editor-progressbar" class="uk-invisible uk-position-center-right-out uk-margin-small-left">
+				<img src="[doc_base_url_common]/progressbars/progressbar_fading_lines_16x16.gif" alt="{tinymce_update_progressbar_img_alt}">
+			</div>
+
+		</div>
+
+		<div id="winix-editor-messages-status-success" class="winix-editor-messages-status-success">
+		</div>
+
+		<div id="winix-editor-messages-status-error" class="winix-editor-messages-status-error">
+		</div>
+
+	</div>
+
+
 </form>
 
 

winixd/html/fun_uname.html

@@ -6,11 +6,12 @@
 
 [if sys_plugin_tab]
 
-	{uname_available_plugins}:
-	<ul>
-	
+	<h2>{uname_available_plugins}</h2>
+
+	<ul class="uk-list">
+
 	[for sys_plugin_tab]
-	<li>[if sys_plugin_tab_has_name][sys_plugin_tab_name][else]&lt;{uname_plugin_unknown}&gt;[end]</li>
+		<li>[if sys_plugin_tab_has_name][sys_plugin_tab_name][else]&lt;{uname_plugin_unknown}&gt;[end]</li>
 	[end]
 
 	</ul>

winixd/html/fun_upload.html

@@ -19,98 +19,188 @@
     <noscript><input type="hidden" name="redirect" value="https://blueimp.github.io/jQuery-File-Upload/"></noscript>
     [end]
 
-	[# The fileupload-buttonbar contains buttons to add/delete files and start/cancel the upload]
-    <div class="fileupload-buttonbar">
-        <div class="fileupload-buttons">
-            [# The fileinput-button span is used to style the file input field as button]
-            <span class="fileinput-button">
-                <span>{upload_button_add_files}</span>
-                <input type="file" name="files\[\]" multiple>
+        <div class="row fileupload-buttonbar">
+          <div class="col-lg-7">
+            <!-- The fileinput-button span is used to style the file input field as button -->
+            <span class="btn btn-success fileinput-button">
+              <i class="glyphicon glyphicon-plus"></i>
+              <span>{upload_button_add_files}</span>
+              <input type="file" name="files\[\]" multiple />
             </span>
-            <button type="submit" class="start">{upload_button_start_upload}</button>
-            <button type="reset" class="cancel">{upload_button_cancel_upload}</button>
-            <button type="button" class="delete">{upload_button_delete}</button>
-            <input type="checkbox" class="toggle">
-            [# The global file processing state]
+            <button type="submit" class="btn btn-primary start">
+              <i class="glyphicon glyphicon-upload"></i>
+              <span>{upload_button_start_upload}</span>
+            </button>
+            <button type="reset" class="btn btn-warning cancel">
+              <i class="glyphicon glyphicon-ban-circle"></i>
+              <span>{upload_button_cancel_upload}</span>
+            </button>
+            <button type="button" class="btn btn-danger delete">
+              <i class="glyphicon glyphicon-trash"></i>
+              <span>{upload_button_delete}</span>
+            </button>
+
+            [# to the checkbox added form-check-input class and style element]
+            <input type="checkbox" class="toggle form-check-input" style="transform: none;">
+
+            <!-- The global file processing state -->
             <span class="fileupload-process"></span>
-        </div>
-        [# The global progress state]
-        <div class="fileupload-progress fade" style="display:none">
-            [# The global progress bar]
-            <div class="progress" role="progressbar" aria-valuemin="0" aria-valuemax="100"></div>
-            [# The extended global progress state]
+          </div>
+          <!-- The global progress state -->
+          <div class="col-lg-5 fileupload-progress fade">
+            <!-- The global progress bar -->
+            <div
+              class="progress progress-striped active"
+              role="progressbar"
+              aria-valuemin="0"
+              aria-valuemax="100"
+            >
+              <div
+                class="progress-bar progress-bar-success"
+                style="width: 0%;"
+              ></div>
+            </div>
+            <!-- The extended global progress state -->
             <div class="progress-extended">&nbsp;</div>
+          </div>
         </div>
-    </div>
-    [# The table listing the files available for upload/download]
-    <table role="presentation"><tbody class="files"></tbody></table>
+
+        <!-- The table listing the files available for upload/download -->
+        <table role="presentation" class="table table-striped">
+          <tbody class="files"></tbody>
+        </table>
 </form>
 
+
 [# The blueimp Gallery widget]
-<div id="blueimp-gallery" class="blueimp-gallery blueimp-gallery-controls" data-filter=":even">
-    <div class="slides"></div>
-    <h3 class="title"></h3>
-    <a class="prev">‹</a>
-    <a class="next">›</a>
-    <a class="close">×</a>
-    <a class="play-pause"></a>
-    <ol class="indicator"></ol>
+<div
+  id="blueimp-gallery"
+  class="blueimp-gallery blueimp-gallery-controls"
+  aria-label="image gallery"
+  aria-modal="true"
+  role="dialog"
+  data-filter=":even"
+>
+  <div class="slides" aria-live="polite"></div>
+  <h3 class="title"></h3>
+  <a
+	class="prev"
+	aria-controls="blueimp-gallery"
+	aria-label="previous slide"
+	aria-keyshortcuts="ArrowLeft"
+  ></a>
+  <a
+	class="next"
+	aria-controls="blueimp-gallery"
+	aria-label="next slide"
+	aria-keyshortcuts="ArrowRight"
+  ></a>
+  <a
+	class="close"
+	aria-controls="blueimp-gallery"
+	aria-label="close"
+	aria-keyshortcuts="Escape"
+  ></a>
+  <a
+	class="play-pause"
+	aria-controls="blueimp-gallery"
+	aria-label="play slideshow"
+	aria-keyshortcuts="Space"
+	aria-pressed="false"
+	role="button"
+  ></a>
+  <ol class="indicator"></ol>
 </div>
 
+
 [# The template to display files available for upload]
 <script id="template-upload" type="text/x-tmpl">
-			\{% for (var i=0, file; file=o.files\[i\]; i++) \{ %\}
-				<tr class="template-upload fade">
-					<td>
-						<span class="preview"></span>
-					</td>
-					<td>
-						<p class="name">\{%=file.name%\}</p>
-						<strong class="error"></strong>
-					</td>
-					<td>
-						<p class="size">Processing...</p>
-						<div class="progress"></div>
-					</td>
-					<td>
-						\{% if (!i && !o.options.autoUpload) \{ %\}
-							<button class="start" disabled>Start</button>
-						\{% \} %\}
-						\{% if (!i) \{ %\}
-							<button class="cancel">Cancel</button>
-						\{% \} %\}
-					</td>
-				</tr>
-			\{% \} %\}</script>
+      \{% for (var i=0, file; file=o.files\[i\]; i++) \{ %\}
+          <tr class="template-upload fade\{%=o.options.loadImageFileTypes.test(file.type)?' image':''%\}">
+              <td>
+                  <span class="preview"></span>
+              </td>
+              <td>
+                  <p class="name">\{%=file.name%\}</p>
+                  <strong class="error text-danger"></strong>
+              </td>
+              <td>
+                  <p class="size">{upload_processing}</p>
+                  <div class="progress progress-striped active" role="progressbar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0"><div class="progress-bar progress-bar-success" style="width:0%;"></div></div>
+              </td>
+              <td>
+                  \{% if (!o.options.autoUpload && o.options.edit && o.options.loadImageFileTypes.test(file.type)) \{ %\}
+                    <button class="btn btn-success edit" data-index="\{%=i%\}" disabled>
+                        <i class="glyphicon glyphicon-edit"></i>
+                        <span>{upload_button_edit}</span>
+                    </button>
+                  \{% \} %\}
+                  \{% if (!i && !o.options.autoUpload) \{ %\}
+                      <button class="btn btn-primary start" disabled>
+                          <i class="glyphicon glyphicon-upload"></i>
+                          <span>{upload_button_start_upload}</span>
+                      </button>
+                  \{% \} %\}
+                  \{% if (!i) \{ %\}
+                      <button class="btn btn-warning cancel">
+                          <i class="glyphicon glyphicon-ban-circle"></i>
+                          <span>{upload_button_cancel_upload}</span>
+                      </button>
+                  \{% \} %\}
+              </td>
+          </tr>
+      \{% \} %\}</script>
 
 [# The template to display files available for download]
 <script id="template-download" type="text/x-tmpl">
-			\{% for (var i=0, file; file=o.files\[i\]; i++) \{ %\}
-				<tr class="template-download fade">
-					<td>
-						<span class="preview">
-							\{% if (file.thumbnailUrl) \{ %\}
-								<a href="\{%=file.url%\}" title="\{%=file.name%\}" download="\{%=file.name%\}" data-gallery><img src="\{%=file.thumbnailUrl%\}"></a>
-							\{% \} %\}
-						</span>
-					</td>
-					<td>
-						<p class="name">
-							<a href="\{%=file.url%\}" title="\{%=file.name%\}" download="\{%=file.name%\}" \{%=file.thumbnailUrl?'data-gallery':''%\}>\{%=file.name%\}</a>
-						</p>
-						\{% if (file.error) \{ %\}
-							<div><span class="error">Error</span> \{%=file.error%\}</div>
-						\{% \} %\}
-					</td>
-					<td>
-						<span class="size">\{%=o.formatFileSize(file.size)%\}</span>
-					</td>
-					<td>
-						<button class="delete" data-type="\{%=file.deleteType%\}" data-url="\{%=file.deleteUrl%\}"\{% if (file.deleteWithCredentials) \{ %\} data-xhr-fields='\{"withCredentials":true\}'\{% \} %\}>Delete</button>
-						<input type="checkbox" name="delete" value="1" class="toggle">
-					</td>
-				</tr>
-			\{% \} %\}</script>
+      \{% for (var i=0, file; file=o.files\[i\]; i++) \{ %\}
+          <tr class="template-download fade\{%=file.thumbnailUrl?' image':''%\}">
+              <td>
+                  <span class="preview">
+                      \{% if (file.thumbnailUrl) \{ %\}
+                          <a href="\{%=file.url%\}" title="\{%=file.name%\}" download="\{%=file.name%\}" data-gallery><img src="\{%=file.thumbnailUrl%\}"></a>
+                      \{% \} %\}
+                  </span>
+              </td>
+              <td>
+                  <p class="name">
+                      \{% if (file.url) \{ %\}
+                          <a href="\{%=file.url%\}" title="\{%=file.name%\}" download="\{%=file.name%\}" \{%=file.thumbnailUrl?'data-gallery':''%\}>\{%=file.name%\}</a>
+                      \{% \} else \{ %\}
+                          <span>\{%=file.name%\}</span>
+                      \{% \} %\}
+                  </p>
+                  \{% if (file.error) \{ %\}
+                      <div><span class="label label-danger">{upload_error}</span> \{%=file.error%\}</div>
+                  \{% \} %\}
+              </td>
+              <td>
+                  <span class="size">\{%=o.formatFileSize(file.size)%\}</span>
+              </td>
+              <td>
+                  \{% if (file.deleteUrl) \{ %\}
+
+					[# added one div to inline the button with the checkbox]
+					[# to the checkbox added form-check-input class and style element]
+
+					<div class="form-inline" style="white-space: nowrap;">
+                      <button class="btn btn-danger delete" data-type="\{%=file.deleteType%\}" data-url="\{%=file.deleteUrl%\}"\{% if (file.deleteWithCredentials) \{ %\} data-xhr-fields='\{"withCredentials":true\}'\{% \} %\}>
+                          <i class="glyphicon glyphicon-trash"></i>
+                          <span>{upload_button_delete}</span>
+                      </button>
+                      <input type="checkbox" name="delete" value="1" class="toggle form-check-input" style="transform: none;">
+                    </div>
+
+
+                  \{% \} else \{ %\}
+                      <button class="btn btn-warning cancel">
+                          <i class="glyphicon glyphicon-ban-circle"></i>
+                          <span>{upload_button_cancel}</span>
+                      </button>
+                  \{% \} %\}
+              </td>
+          </tr>
+      \{% \} %\}</script>
 
 
 <script type="text/javascript">
@@ -129,8 +219,6 @@
 			    '/cors/result.html?%s'
             ));
 
-			$("div.winix #fileupload button.cancel").css('display','inline');
-
             [# loading existing files]
             [# copied from common/fileupload/js/main.js]
             $('#fileupload').addClass('fileupload-processing');

winixd/html/fun_uptime.html

@@ -2,20 +2,40 @@
 
 <h1>{uptime_header}</h1>
 
-<p>{uptime_current_time}: [winix_cur_time]<br>
-{uptime_up}:
+<table class="uk-table uk-table-divider uk-table-small uk-table-justify uk-width-2-3@s uk-width-1-2@m">
 
+<tr>
+<th>{uptime_current_time}</th><td>[winix_cur_time]</td>
+</tr>
+
+<tr>
+<th>{uptime_up}</th>
+<td>
 [if uptime_more_than_one_day]
 	[uptime_days] {uptime_days}
 [else]
 	[uptime_hours]
 [end]
-<br>
-{uptime_how_many_sessions}: [winix_how_many_sessions]<br>
-{uptime_users_logged}: [winix_users_logged]<br>
-{load_avg}: [winix_loadavg_now], [winix_loadavg_1], [winix_loadavg_5], [winix_loadavg_15]<br>
-{req_per_sec}: [winix_req_per_sec_now], [winix_req_per_sec_1], [winix_req_per_sec_5], [winix_req_per_sec_15]
-</p>
+</td>
+</tr>
+
+<tr>
+<th>{uptime_how_many_sessions}</th><td>[winix_how_many_sessions]</td>
+</tr>
+
+<tr>
+<th>{uptime_users_logged}</th><td>[winix_users_logged]</td>
+</tr>
+
+<tr>
+<th>{load_avg}</th><td>[winix_loadavg_now], [winix_loadavg_1], [winix_loadavg_5], [winix_loadavg_15]</td>
+</tr>
+
+<tr>
+<th>{req_per_sec}</th><td>[winix_req_per_sec_now], [winix_req_per_sec_1], [winix_req_per_sec_5], [winix_req_per_sec_15]</td>
+</tr>
+
+</table>
 
 
 </div>

winixd/html/fun_vim.html

@@ -3,44 +3,55 @@
 [if item_is]<h1>{edit}</h1>[else]<h1>{add}</h1>[end]
 
 
-<form id="additem" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]vim">
-<fieldset>
-	<legend>{form_emacs_legend}</legend>
-	
-	[if mount_type_is "cms"]
-		<p class="withnext">{title}:</p>
-		<input class="edit" type="text" name="subject" value="[item_subject]">
-		
-		<p class="withnext">{suggested_url}:</p>
-		<input class="edit" type="text" name="url" value="[item_url]">
+<form class="uk-form-stacked" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]vim">
+
+
+	[if one [mount_type_is "cms"] [any [mount_type_is "thread"] [thread_mount_arg_is "subject"]]]
+	<div class="uk-margin">
+		<label class="uk-form-label" for="winix_title_id">{title}</label>
+		<div class="uk-form-controls">
+			<input class="uk-input" id="winix_title_id" type="text" name="subject" value="[item_subject]" [if not item_is]autofocus [end]>
+		</div>
+	</div>
+
+	<div class="uk-margin">
+		<label class="uk-form-label" for="winix_url_id">{suggested_url}</label>
+		<div class="uk-form-controls">
+			<input class="uk-input" id="winix_url_id" type="text" name="url" value="[item_url]">
+		</div>
+	</div>
 	[end]
+
+	<div class="uk-margin">
+	[if mount_type_is "cms"]<label class="uk-form-label" for="winix_content_id">{form_emacs_content_cms}</label>[end]
+	[if mount_type_is "thread"]<label class="uk-form-label" for="winix_content_id">{form_emacs_content_thread}</label>[end]
+	[if mount_type_is "ticket"]<label class="uk-form-label" for="winix_content_id">{form_emacs_content_ticket}</label>[end]
+
 	
-	[if any [mount_type_is "thread"] [thread_mount_arg_is "subject"]]
-		<p class="withnext">{title}:</p>
-		<input class="edit" type="text" name="subject" value="[item_subject]">
-		
-		<p class="withnext">{suggested_url}:</p>
-		<input class="edit" type="text" name="url" value="[item_url]">
-	[end]
+		<div class="uk-form-controls">
+			<textarea class="multitext" rows="[if mount_type_is "cms"]30[else]10[end]" cols="60" name="itemcontent">[item_content]</textarea>
+		</div>
+
+	</div>
 	
-	[if mount_type_is "cms"]<p class="withnext">{form_emacs_content_cms}</p>[end]
-	[if mount_type_is "thread"]<p class="withnext">{form_emacs_content_thread}</p>[end]
-	[if mount_type_is "ticket"]<p class="withnext">{form_emacs_content_ticket}</p>[end]
-	
-	<textarea class="multitext" rows="[if mount_type_is "cms"]30[else]10[end]" cols="60" name="itemcontent">[item_content]</textarea>
-	
-	<input type="hidden" name="contenttype" value="2">
-	
-	[if winix_function_param_is "full"]
-	[else]
-	[end]
+	<div class="uk-form-controls">
+		<input type="hidden" name="contenttype" value="2">
+	</div>
 	
 	[if not user_logged]
-		<p class="withnext">{nick}:</p>
-		<input class="edit" type="text" name="guestname" value="[item_guest_name]">
-		
-		<p class="withnext">{rebus_how_is_it} [rebus_question]?</p>
-		<input class="edit" type="text" name="rebus">
+		<div class="uk-margin">
+			<label class="uk-form-label" for="winix_nick_id">{nick}</label>
+			<div class="uk-form-controls">
+				<input class="uk-input" id="winix_nick_id" type="text" name="guestname" value="[item_guest_name]">
+			</div>
+		</div>
+
+		<div class="uk-margin">
+			<label class="uk-form-label" for="winix_rebus_id">{rebus_how_is_it} [rebus_question]?</label>
+			<div class="uk-form-controls">
+				<input class="uk-input" id="winix_rebus_id" type="text" name="rebus">
+			</div>
+		</div>
 		
 		[include "antispam.html"]
 	[end]
@@ -49,8 +60,10 @@
 		<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 	[end]
 	
-	<input class="submit" type="submit" value="[if item_is]{change}[else]{add}[end]">
-</fieldset>
+	<div class="uk-form-controls">
+		<input class="uk-button uk-button-primary" type="submit" value="[if item_is]{change}[else]{add}[end]">
+	</div>
+
 </form>
 
 

winixd/html/fun_who.html

@@ -4,7 +4,7 @@
 
 
 [if who_tab]
-	<table class="who">
+	<table class="uk-table uk-table-divider uk-table-small uk-table-justify uk-table-responsive">
 	<tr><th>{who_tab_index}</th><th>{user}</th><th>{who_tab_start}</th><th>{who_tab_last_active}</th></tr>
 	[for who_tab]
 		<tr><td>[who_tab_lp]</td><td>[who_tab_user]</td><td>[who_tab_time]</td><td>[who_tab_last_time]</td></tr>

winixd/html/index.html

@@ -1,24 +1,31 @@
 <!DOCTYPE html>
 [# minimalistic template]
 
-<html lang="{language}">
+<html lang="{winix_html_lang_attr}">
 
 <head>
-	<meta charset="UTF-8">
+	[include "index_head_adder.html"]
 	<title>[doc_title]</title>
-	[include "index_head_functions_add.html"]
 </head>
 
 <body>
 
-<div>
-[include "slog.html"]
+	<div class="uk-container uk-container-small">
 
-[# each winix function has div.winix in its template defined -- only functions: cat and run don't have div.winix]
-[# so you can easly use 'content' with your own template]
-[# and when using other winix functions you automatically get proper styling]
-[content]
-</div>
+		<div class="uk-margin-top" data-uk-height-viewport="expand: true">
+			[include "slog.html"]
+			[content]
+		</div>
 
+		<div class="uk-margin-top uk-margin-bottom uk-text-center">
+			<span class="uk-text-small uk-text-muted">
+				© [current_year] [doc_base_url] - <a href="https://gitea.ttmath.org/tomasz.sowa/winix" title="{winix_backend_tooltip}" target="_blank" data-uk-tooltip>{winix_backend_info} [sys_ver_major].[sys_ver_minor].[sys_ver_revision]</a>
+				| {winix_frontend_info} <a href="http://getuikit.com" title="{winix_frontend_tooltip}" target="_blank" data-uk-tooltip><span data-uk-icon="uikit"></span></a>
+			</span>
+		</div>
+
+	</div>
+
+	[include "index_bottom_adder.html"]
 </body>
 </html>

winixd/html/index_bottom_adder.html

@@ -0,0 +1,2 @@
+
+

winixd/html/index_generic.html

@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+[# minimalistic template]
+
+<html lang="{winix_html_lang_attr}">
+
+<head>
+	[include "index_head_adder.html"]
+	<title>[doc_title]</title>
+</head>
+
+<body>
+	[include "slog.html"]
+	[content]
+	[include "index_bottom_adder.html"]
+</body>
+</html>

winixd/html/index_head_adder.html

@@ -0,0 +1,272 @@
+[def winix_has_uikit "true"]
+[def winix_has_jquery "false"]
+
+
+[# IMPROME ME we can add some conditionales such as 'do_not_set_charset']
+<meta charset="UTF-8">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+
+[# UIkit CSS]
+<link rel="stylesheet" href="[doc_base_url_common]/uikit/uikit-3.6.16/css/uikit.min.css">
+
+[# UIkit JS]
+<script src="[doc_base_url_common]/uikit/uikit-3.6.16/js/uikit.min.js"></script>
+<script src="[doc_base_url_common]/uikit/uikit-3.6.16/js/uikit-icons.min.js"></script>
+
+
+
+
+[if winix_function_is "emacs"]
+	<script type="text/javascript" src="[doc_base_url_common]/codemirror/5.59.2/lib/codemirror.js"></script>
+	<link rel="stylesheet" href="[doc_base_url_common]/codemirror/5.59.2/lib/codemirror.css" type="text/css">
+
+	<script src="[doc_base_url_common]/codemirror/5.59.2/mode/css/css.js"></script>
+	<script src="[doc_base_url_common]/codemirror/5.59.2/mode/javascript/javascript.js"></script>
+	<script src="[doc_base_url_common]/codemirror/5.59.2/mode/xml/xml.js"></script>
+	<script src="[doc_base_url_common]/codemirror/5.59.2/mode/htmlmixed/htmlmixed.js"></script>
+
+	<!--<link rel="stylesheet" href="[doc_base_url_common]/codemirror/5.59.2/theme/base16-light.css" type="text/css">-->
+
+	<script src="[doc_base_url_common]/codemirror/5.59.2/addon/display/fullscreen.js"></script>
+	<link rel="stylesheet" href="[doc_base_url_common]/codemirror/5.59.2/addon/display/fullscreen.css" type="text/css">
+
+[if false]
+	<script src="[doc_base_url_common]/codemirror/5.59.2/addon/search/search.js"></script>
+	<link rel="stylesheet" href="[doc_base_url_common]/codemirror/5.59.2/addon/search/matchesonscrollbar.css" type="text/css">
+[end]
+
+<script src="[doc_base_url_common]/codemirror/5.59.2/addon/fold/xml-fold.js"></script>
+<script src="[doc_base_url_common]/codemirror/5.59.2/addon/edit/matchtags.js"></script>
+
+<script src="[doc_base_url_common]/codemirror/5.59.2/addon/selection/active-line.js"></script>
+
+<style>
+
+.CodeMirror-matchingtag \{
+	font-weight: bold;
+	background: none;
+\}
+
+.CodeMirror-activeline-background \{
+	background: #f3f3f3;
+\}
+
+.CodeMirror \{
+	border: 1px solid #dedede;
+\}
+
+
+</style>
+
+
+	<script type="text/javascript">
+	var winix_code_mirror_editor;
+	function winix_initialize_editor()
+	\{
+		var text_area = document.getElementById("winix_content_id");
+		if( text_area )
+		\{
+			winix_code_mirror_editor = CodeMirror.fromTextArea(text_area, \{
+				mode: "htmlmixed",
+				theme: "default",
+				indentUnit: 4,
+				smartIndent: true,
+				tabSize: 4,
+				indentWithTabs: true,
+				extraKeys: \{
+					"F11": function(cm) \{ cm.setOption("fullScreen", !cm.getOption("fullScreen")); \},
+					"Esc": function(cm) \{ if (cm.getOption("fullScreen")) cm.setOption("fullScreen", false); \}
+				\},
+				lineNumbers: true,
+				lineWiseCopyCut: false,
+				dragDrop: false,
+				matchTags: true,
+				styleActiveLine: true
+			\});
+		\}
+	\}
+
+[if false]
+this will probably be used to change the mode in the fly
+winix_code_mirror_editor.setOption("mode", "");
+
+before saving (update button by ajax) this method should be used:
+cm.save()
+    Copy the content of the editor into the textarea.
+[end]
+
+	if( window.addEventListener )
+		window.addEventListener("load", winix_initialize_editor, false);
+	else
+	if( window.attachEvent )
+		window.attachEvent("onload", winix_initialize_editor);
+	</script>
+
+[end]
+
+
+[if winix_function_is "ckeditor"]
+	[def winix_has_jquery "true"]
+	<script type="text/javascript" src="[doc_base_url_common]/ckeditor_4.9.2/ckeditor.js"></script>
+	<script type="text/javascript" src="[doc_base_url_common]/jquery/1.12.4/jquery.min.js"></script>
+	<script type="text/javascript" src="[doc_base_url_common]/winix/update_button.js"></script>
+[end]
+
+
+[if winix_function_is "tinymce"]
+	<script type="text/javascript" src="[doc_base_url]/common/tiny_mce/5.6.2/tinymce.min.js"></script>
+
+	[# tinymce can use a special theme called 'mobile' - it is used when /mobile param is provided]
+	<script type="text/javascript" src="[doc_base_url]/var/tinymce.js[if winix_function_param_is "mobile"]/-/mobile[end]"></script>
+
+	[def winix_has_jquery "true"]
+	<script type="text/javascript" src="[doc_base_url_common]/jquery/1.12.4/jquery.min.js"></script>
+	<script type="text/javascript" src="[doc_base_url_common]/winix/update_button.js"></script>
+[end]
+
+
+[if winix_function_is "nicedit"]
+	<script type="text/javascript" src="[doc_base_url_common]/nicedit/0.9_r25/nicEdit.js"></script>
+[end]
+
+
+
+[if winix_function_is "vim"]
+
+	[# info from version 0.5-rc1: this editor doesn't work on different domains by default, solution: http://forum.wymeditor.org/forum/viewtopic.php?f=2&t=731&p=2507#p2504 ]
+	[# you should add one file to winix: wymiframe.html ]
+
+	[def winix_has_jquery "true"]
+	<script type="text/javascript" src="[doc_base_url_common]/jquery/1.12.4/jquery.min.js"></script>
+	<script type="text/javascript" src="[doc_base_url_common]/wymeditor/1.1.1/wymeditor/jquery.wymeditor.min.js"></script>
+	<link rel="stylesheet" type="text/css" href="[doc_base_url_common]/wymeditor/1.1.1/wymeditor/skins/default/skin.css">
+	<script type="text/javascript">jQuery(function() \{ jQuery("textarea").wymeditor(\{ basePath: "[doc_base_url_common]/wymeditor/", iframeBasePath: "[doc_base_url]/var/", updateSelector : "form", updateEvent: 'submit' \}); \});</script>
+	
+[end]
+
+
+
+
+[if winix_function_is "gallery"]
+
+	[if gallery_mount_type_arg_is "lightbox"]
+		[# https://lokeshdhakar.com/projects/lightbox2/ ]
+
+		[def winix_has_jquery "true"]
+		<script type="text/javascript" src="[doc_base_url_common]/jquery/1.12.4/jquery.min.js"></script>
+		<link rel="stylesheet" href="[doc_base_url_common]/lightbox/2.11.3/dist/css/lightbox.min.css" type="text/css">
+		<script src="[doc_base_url_common]/lightbox/2.11.3/dist/js/lightbox.min.js" type="text/javascript"></script>
+	[end]
+
+	[if gallery_mount_type_arg_is "galleriajs"]
+		[# https://galleriajs.github.io/ ]
+		[# formerly called aino-gallery ]
+		
+		[def winix_has_jquery "true"]
+		<script type="text/javascript" src="[doc_base_url_common]/jquery/1.12.4/jquery.min.js"></script>
+		<script src="[doc_base_url_common]/galleriajs/1.6.1/dist/galleria.min.js" type="text/javascript"></script>
+	[end]
+	
+[end]
+
+
+
+[if winix_function_is "upload"]
+	[# https://blueimp.github.io/jQuery-File-Upload/]
+	[# https://github.com/blueimp/jQuery-File-Upload]
+
+	[# Force latest IE rendering engine or ChromeFrame if installed]
+	<!--\[if IE\]>
+	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+	<!\[endif\]-->
+
+
+    <link rel="stylesheet" href="[doc_base_url_common]/bootstrap/3.3.7/css/bootstrap.min.css">
+
+	[# in doc_base_url_common/jquery-file-upload/10.31.0_extra/blueimp-gallery/ is download_all_files.sh script in order to download all necessary files]
+    <!-- blueimp Gallery styles -->
+    <link rel="stylesheet" href="[doc_base_url_common]/jquery-file-upload/10.31.0_extra/blueimp-gallery/blueimp-gallery.min.css">
+
+    [# CSS to style the file input field as button and adjust the Bootstrap progress bars]
+    <link rel="stylesheet" href="[doc_base_url_common]/jquery-file-upload/10.31.0/css/jquery.fileupload.css">
+    <link rel="stylesheet" href="[doc_base_url_common]/jquery-file-upload/10.31.0/css/jquery.fileupload-ui.css">
+
+    [# CSS adjustments for browsers with JavaScript disabled]
+    <noscript>
+		<link rel="stylesheet" href="[doc_base_url_common]/jquery-file-upload/10.31.0/css/jquery.fileupload-noscript.css">
+		<link rel="stylesheet" href="[doc_base_url_common]/jquery-file-upload/10.31.0/css/jquery.fileupload-ui-noscript.css">
+	</noscript>
+
+
+	[def winix_has_jquery "true"]
+    <script src="[doc_base_url_common]/jquery/1.12.4/jquery.min.js"></script>
+
+
+    <!-- The jQuery UI widget factory, can be omitted if jQuery UI is already included -->
+    <script src="[doc_base_url_common]/jquery-file-upload/10.31.0/js/vendor/jquery.ui.widget.js"></script>
+
+    <!-- The Templates plugin is included to render the upload/download listings -->
+    <script src="[doc_base_url_common]/jquery-file-upload/10.31.0_extra/tmpl.min.js"></script>
+    <!-- The Load Image plugin is included for the preview images and image resizing functionality -->
+    <script src="[doc_base_url_common]/jquery-file-upload/10.31.0_extra/load-image.all.min.js"></script>
+    <!-- The Canvas to Blob plugin is included for image resizing functionality -->
+    <script src="[doc_base_url_common]/jquery-file-upload/10.31.0_extra/canvas-to-blob.min.js"></script>
+    <!-- blueimp Gallery script -->
+    <script src="[doc_base_url_common]/jquery-file-upload/10.31.0_extra/jquery.blueimp-gallery.min.js"></script>
+
+    <!-- The Iframe Transport is required for browsers without support for XHR file uploads -->
+    <script src="[doc_base_url_common]/jquery-file-upload/10.31.0/js/jquery.iframe-transport.js"></script>
+    <!-- The basic File Upload plugin -->
+    <script src="[doc_base_url_common]/jquery-file-upload/10.31.0/js/jquery.fileupload.js"></script>
+    <!-- The File Upload processing plugin -->
+    <script src="[doc_base_url_common]/jquery-file-upload/10.31.0/js/jquery.fileupload-process.js"></script>
+    <!-- The File Upload image preview & resize plugin -->
+    <script src="[doc_base_url_common]/jquery-file-upload/10.31.0/js/jquery.fileupload-image.js"></script>
+    <!-- The File Upload audio preview plugin -->
+    <script src="[doc_base_url_common]/jquery-file-upload/10.31.0/js/jquery.fileupload-audio.js"></script>
+    <!-- The File Upload video preview plugin -->
+    <script src="[doc_base_url_common]/jquery-file-upload/10.31.0/js/jquery.fileupload-video.js"></script>
+    <!-- The File Upload validation plugin -->
+    <script src="[doc_base_url_common]/jquery-file-upload/10.31.0/js/jquery.fileupload-validate.js"></script>
+    <!-- The File Upload user interface plugin -->
+    <script src="[doc_base_url_common]/jquery-file-upload/10.31.0/js/jquery.fileupload-ui.js"></script>
+
+    [if false]
+    [# the code to run the plugin we have in fun_upload.html]
+    <!-- The main application script -->
+	<!--
+    <script src="[doc_base_url_common]/jquery-file-upload/10.31.0/js/demo.js"></script>
+	-->
+	[end]
+
+    <!-- The XDomainRequest Transport is included for cross-domain file deletion for IE 8 and IE 9 -->
+    <!--\[if (gte IE 8)&(lt IE 10)\]>
+      <script src="[doc_base_url_common]/jquery-file-upload/10.31.0/js/cors/jquery.xdr-transport.js"></script>
+    <!\[endif\]-->
+
+[end]
+
+
+
+[if winix_function_is "sort"]
+	[if not item_is]
+	<script type="text/javascript" src="[doc_base_url_common]/winix/winix_sort.js"></script>
+	[end]
+[end]
+
+
+[if winix_function_is "imgcrop"]
+	[def winix_has_jquery "true"]
+	<script type="text/javascript" src="[doc_base_url_common]/jquery/1.12.4/jquery.min.js"></script>
+	<script type="text/javascript" src="[doc_base_url_common]/jcrop/0.9.15/js/jquery.Jcrop.min.js"></script>
+	<link type="text/css" rel="stylesheet" href="[doc_base_url_common]/jcrop/0.9.15/css/jquery.Jcrop.min.css">
+[end]
+
+
+[if false]
+[# temporarily blocked]
+[if winix_has_plugin "stats"]
+	[include "stats_info.html"]
+[end]
+[end]
+

winixd/html/index_head_functions_add.html

@@ -1,318 +0,0 @@
-[# other stuff needed by a specific function]
-
-[if one [winix_function_is "adduser"]
-	[winix_function_is "chmod"]
-	[winix_function_is "chown"]
-	[winix_function_is "ckeditor"]
-	[winix_function_is "cp"]
-	[winix_function_is "default"]
-	[winix_function_is "download"]
-	[winix_function_is "emacs"]
-	[winix_function_is "env"]
-	[winix_function_is "imgcrop"]
-	[winix_function_is "ipban"]
-	[winix_function_is "last"]
-	[winix_function_is "ln"]
-	[winix_function_is "locale"]
-	[winix_function_is "login"]
-	[winix_function_is "logout"]
-	[winix_function_is "ls"]
-	[winix_function_is "man"]
-	[winix_function_is "meta"]
-	[winix_function_is "mkdir"]
-	[winix_function_is "mount"]
-	[winix_function_is "mv"]
-	[winix_function_is "nicedit"]
-	[winix_function_is "node"]
-	[winix_function_is "passwd"]
-	[winix_function_is "priv"]
-	[winix_function_is "pw"]
-	[winix_function_is "reload"]
-	[winix_function_is "rm"]
-	[winix_function_is "rmuser"]
-	[winix_function_is "sort"]
-	[winix_function_is "stat"]
-	[winix_function_is "subject"]
-	[winix_function_is "template"]
-	[winix_function_is "timezone"]
-	[winix_function_is "tinymce"]
-	[winix_function_is "uname"]
-	[winix_function_is "upload"]
-	[winix_function_is "uptime"]
-	[winix_function_is "vim"]
-	[winix_function_is "who"]]
-	<link rel="stylesheet" href="[doc_base_url_common]/winix/winix.css" type="text/css">
-[end]
-
-
-[if winix_function_is "emacs"]
-	<script type="text/javascript" src="[doc_base_url_common]/codemirror-5.1/lib/codemirror.js"></script>
-	<link rel="stylesheet" href="[doc_base_url_common]/codemirror-5.1/lib/codemirror.css" type="text/css">
-
-	<script src="[doc_base_url_common]/codemirror-5.1/mode/css/css.js"></script>
-	<script src="[doc_base_url_common]/codemirror-5.1/mode/javascript/javascript.js"></script>
-	<script src="[doc_base_url_common]/codemirror-5.1/mode/xml/xml.js"></script>
-	<script src="[doc_base_url_common]/codemirror-5.1/mode/htmlmixed/htmlmixed.js"></script>
-
-	<!--<link rel="stylesheet" href="[doc_base_url_common]/codemirror-5.1/theme/base16-light.css" type="text/css">-->
-
-	<script src="[doc_base_url_common]/codemirror-5.1/addon/display/fullscreen.js"></script>
-	<link rel="stylesheet" href="[doc_base_url_common]/codemirror-5.1/addon/display/fullscreen.css" type="text/css">
-
-[if false]
-	<script src="[doc_base_url_common]/codemirror-5.1/addon/search/search.js"></script>
-	<link rel="stylesheet" href="[doc_base_url_common]/codemirror-5.1/addon/search/matchesonscrollbar.css" type="text/css">
-[end]
-
-<script src="[doc_base_url_common]/codemirror-5.1/addon/fold/xml-fold.js"></script>
-<script src="[doc_base_url_common]/codemirror-5.1/addon/edit/matchtags.js"></script>
-
-<script src="[doc_base_url_common]/codemirror-5.1/addon/selection/active-line.js"></script>
-
-<style>
-
-.CodeMirror-matchingtag \{
-	font-weight: bold;
-	background: none;
-\}
-
-.CodeMirror-activeline-background \{
-	background: #f3f3f3;
-\}
-
-.CodeMirror \{
-	border: 1px solid #dedede;
-\}
-
-
-</style>
-
-
-	<script type="text/javascript">
-	var winix_code_mirror_editor;
-	function winix_initialize_editor()
-	\{
-		var text_area = document.getElementById("winix_content_id");
-		if( text_area )
-		\{
-			winix_code_mirror_editor = CodeMirror.fromTextArea(text_area, \{
-				mode: "htmlmixed",
-				theme: "default",
-				indentUnit: 4,
-				smartIndent: true,
-				tabSize: 4,
-				indentWithTabs: true,
-				extraKeys: \{
-					"F11": function(cm) \{ cm.setOption("fullScreen", !cm.getOption("fullScreen")); \},
-					"Esc": function(cm) \{ if (cm.getOption("fullScreen")) cm.setOption("fullScreen", false); \}
-				\},
-				lineNumbers: true,
-				lineWiseCopyCut: false,
-				dragDrop: false,
-				matchTags: true,
-				styleActiveLine: true
-			\});
-		\}
-	\}
-
-[if false]
-this will probably be used to change the mode in the fly
-winix_code_mirror_editor.setOption("mode", "");
-
-before saving (update button by ajax) this method should be used:
-cm.save()
-    Copy the content of the editor into the textarea.
-[end]
-
-	if( window.addEventListener )
-		window.addEventListener("load", winix_initialize_editor, false);
-	else
-	if( window.attachEvent )
-		window.attachEvent("onload", winix_initialize_editor);
-	</script>
-
-[end]
-
-
-[if winix_function_is "ckeditor"]
-	<script type="text/javascript" src="[doc_base_url_common]/ckeditor_4.9.2/ckeditor.js"></script>
-	<script type="text/javascript" src="[doc_base_url_common]/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="[doc_base_url_common]/winix/update_button.js"></script>
-[end]
-
-
-[if winix_function_is "tinymce"]
-	<!--<script type="text/javascript">document.domain = "www.slimaczek.pl";</script>-->
-	<script type="text/javascript" src="[doc_base_url]/common/tiny_mce/tiny_mce.js"></script>
-	<script type="text/javascript" src="[doc_base_url]/var/tinymce.js"></script>
-[end]
-
-
-[if winix_function_is "nicedit"]
-	<script type="text/javascript" src="[doc_base_url_common]/nicedit/nicEdit.js"></script>
-[end]
-
-
-
-[if winix_function_is "vim"]
-[# this editor doesn't work on different domains by default, solution: http://forum.wymeditor.org/forum/viewtopic.php?f=2&t=731&p=2507#p2504 ]
-[# you should add one file to winix: wymiframe.html ]
-
-	<script type="text/javascript" src="[doc_base_url_common]/jquery-1.4.2.min.js"></script>
-	<script type="text/javascript" src="[doc_base_url_common]/wymeditor/jquery.wymeditor.min.js"></script>
-	<script type="text/javascript" src="[doc_base_url_common]/wymeditor/lang/en.js"></script>
-	<script type="text/javascript" src="[doc_base_url_common]/wymeditor/skins/default/skin.js"></script>
-	<link rel="stylesheet" type="text/css" href="[doc_base_url_common]/wymeditor/skins/default/skin.css">
-	<script type="text/javascript">jQuery(function() \{ jQuery("textarea").wymeditor(\{ basePath: "[doc_base_url_common]/wymeditor/", iframeBasePath: "[doc_base_url]/var/", updateSelector : "form", updateEvent: 'submit' \}); \});</script>
-	
-[end]
-
-
-
-[if winix_function_is "ticket"]
-[# !! dodac lightboxa tylko jesli tickety zawieraja obrazki ]
-<!--
-[# warning: prototype doesn't work with jquery in clock tickets (in client panel)]
-	<link rel="stylesheet" href="[doc_base_url_common]/lightbox/lightbox.css" type="text/css" media="screen">
-	<script src="[doc_base_url_common]/lightbox/js/prototype.js" type="text/javascript"></script>
-	<script src="[doc_base_url_common]/lightbox/js/scriptaculous.js?load=effects,builder" type="text/javascript"></script>
-	<script src="[doc_base_url_common]/lightbox/js/lightbox.js" type="text/javascript"></script>
--->
-[end]
-
-
-[if winix_function_is "gallery"]
-
-	[if one gallery_has_not_mount_type [gallery_mount_type_arg_is "lightbox"]]
-		<link rel="stylesheet" href="[doc_base_url_common]/lightbox/lightbox.css" type="text/css" media="screen">
-		<script src="[doc_base_url_common]/lightbox/js/prototype.js" type="text/javascript"></script>
-		<script src="[doc_base_url_common]/lightbox/js/scriptaculous.js?load=effects,builder" type="text/javascript"></script>
-		<script src="[doc_base_url_common]/lightbox/js/lightbox.js" type="text/javascript"></script>
-	[end]
-
-	[if one [gallery_mount_type_arg_is "galleria"] [gallery_mount_type_arg_is "galleriathumb"]]
-		<script type="text/javascript" src="[doc_base_url_common]/jquery-1.4.4.min.js"></script>
-		<script src="[doc_base_url_common]/aino-galleria/galleria-1.2.2.min.js" type="text/javascript"></script>
-	[end]
-
-	[if one [gallery_mount_type_arg_is "galleria1.2.9"] [gallery_mount_type_arg_is "galleriathumb1.2.9"]]
-		<script type="text/javascript" src="[doc_base_url_common]/jquery-1.9.1.min.js"></script>
-		<script src="[doc_base_url_common]/galleria/galleria-1.2.9.min.js" type="text/javascript"></script>
-	[end]
-	
-[end]
-
-
-
-[if winix_function_is "upload"]
-	[# http://blueimp.github.io/jQuery-File-Upload/jquery-ui.html]
-	[# https://github.com/blueimp/jQuery-File-Upload]
-	[# we are using the *jQuery UI version* of the plugin]
-
-	[# Force latest IE rendering engine or ChromeFrame if installed]
-	<!--\[if IE\]>
-	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-	<!\[endif\]-->
-
-
-	<!-- jQuery UI styles -->
-	<link rel="stylesheet" href="[doc_base_url_common]/jquery-file-upload/9.28.0/others/jquery-ui.css">
-
-	<!-- Generic page styles -->
-	<link rel="stylesheet" href="[doc_base_url_common]/jquery-file-upload/9.28.0/css/style.css">
-
-	[if false]
-	<style>
-	/* Adjust the jQuery UI widget font-size: */
-	.ui-widgetREMOVEME \{
-		font-size: 0.95em;
-	\}
-	</style>
-	[end]
-
-	<!-- blueimp Gallery styles -->
-	<link rel="stylesheet" href="[doc_base_url_common]/jquery-file-upload/9.28.0/others/blueimp-gallery.min.css">
-
-	<!-- CSS to style the file input field as button and adjust the Bootstrap progress bars -->
-	<link rel="stylesheet" href="[doc_base_url_common]/jquery-file-upload/9.28.0/css/jquery.fileupload.css">
-	<link rel="stylesheet" href="[doc_base_url_common]/jquery-file-upload/9.28.0/css/jquery.fileupload-ui.css">
-
-	<!-- CSS adjustments for browsers with JavaScript disabled -->
-	<noscript><link rel="stylesheet" href="[doc_base_url_common]/jquery-file-upload/9.28.0/css/jquery.fileupload-noscript.css"></noscript>
-	<noscript><link rel="stylesheet" href="[doc_base_url_common]/jquery-file-upload/9.28.0/css/jquery.fileupload-ui-noscript.css"></noscript>
-
-
-	<!--
-	[# it doesn't work with this jquery]
-	<script src="[doc_base_url_common]/jquery/jquery-3.2.1.slim.min.js"></script>
-	-->
-
-	<script src="[doc_base_url_common]/jquery-file-upload/9.28.0/others/jquery.min.js"></script>
-	<script src="[doc_base_url_common]/jquery-file-upload/9.28.0/others/jquery-ui.min.js"></script>
-
-	<!-- The Templates plugin is included to render the upload/download listings -->
-	<script src="[doc_base_url_common]/jquery-file-upload/9.28.0/others/tmpl.min.js"></script>
-
-	<!-- The Load Image plugin is included for the preview images and image resizing functionality -->
-	<script src="[doc_base_url_common]/jquery-file-upload/9.28.0/others/load-image.all.min.js"></script>
-
-	<!-- The Canvas to Blob plugin is included for image resizing functionality -->
-	<script src="[doc_base_url_common]/jquery-file-upload/9.28.0/others/canvas-to-blob.min.js"></script>
-
-	<!-- blueimp Gallery script -->
-	<script src="[doc_base_url_common]/jquery-file-upload/9.28.0/others/jquery.blueimp-gallery.min.js"></script>
-
-	<!-- The Iframe Transport is required for browsers without support for XHR file uploads -->
-	<script src="[doc_base_url_common]/jquery-file-upload/9.28.0/js/jquery.iframe-transport.js"></script>
-
-	<!-- The basic File Upload plugin -->
-	<script src="[doc_base_url_common]/jquery-file-upload/9.28.0/js/jquery.fileupload.js"></script>
-
-	<!-- The File Upload processing plugin -->
-	<script src="[doc_base_url_common]/jquery-file-upload/9.28.0/js/jquery.fileupload-process.js"></script>
-
-	<!-- The File Upload image preview & resize plugin -->
-	<script src="[doc_base_url_common]/jquery-file-upload/9.28.0/js/jquery.fileupload-image.js"></script>
-
-	<!-- The File Upload audio preview plugin -->
-	<script src="[doc_base_url_common]/jquery-file-upload/9.28.0/js/jquery.fileupload-audio.js"></script>
-
-	<!-- The File Upload video preview plugin -->
-	<script src="[doc_base_url_common]/jquery-file-upload/9.28.0/js/jquery.fileupload-video.js"></script>
-
-	<!-- The File Upload validation plugin -->
-	<script src="[doc_base_url_common]/jquery-file-upload/9.28.0/js/jquery.fileupload-validate.js"></script>
-
-	<!-- The File Upload user interface plugin -->
-	<script src="[doc_base_url_common]/jquery-file-upload/9.28.0/js/jquery.fileupload-ui.js"></script>
-
-	<!-- The File Upload jQuery UI plugin -->
-	<script src="[doc_base_url_common]/jquery-file-upload/9.28.0/js/jquery.fileupload-jquery-ui.js"></script>
-
-[end]
-
-
-
-[if winix_function_is "sort"]
-	[if not item_is]
-	<script type="text/javascript" src="[doc_base_url_common]/jquery-1.6.1.min.js"></script>
-	<script type="text/javascript" src="[doc_base_url_common]/jquery-ui-1.8.13/js/jquery-ui-1.8.13.custom.min.js"></script>
-	<script type="text/javascript" src="[doc_base_url_common]/sort.js"></script>
-	[end]
-[end]
-
-
-[if winix_function_is "imgcrop"]
-	<script type="text/javascript" src="[doc_base_url_common]/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="[doc_base_url_common]/jcrop-0.9.12/js/jquery.Jcrop.js"></script>
-	<link type="text/css" rel="stylesheet" href="[doc_base_url_common]/jcrop-0.9.12/css/jquery.Jcrop.css">
-[end]
-
-
-[if false]
-[# temporarily blocked]
-[if winix_has_plugin "stats"]
-	[include "stats_info.html"]
-[end]
-[end]
-

winixd/html/item_info.html

@@ -1,4 +1,4 @@
-<p class="winix_iteminfo">
+<p class="uk-text-meta">
 	{added_by}: [item_user], [item_date_creation_nice][if not item_dates_equal], 
 		{last_modified}[if item_users_different] {by}: [item_modification_user],[else]:[end]
 		[item_date_modification_nice][end]

winixd/html/item_options.html

@@ -1,39 +0,0 @@
-[if not [winix_function_param_is "fullscreen"]]
-[if dir_can_write item_can_write]
-	<div class="winix_itemoptions_a">
-	
-		[if dir_can_write]
-			<h2>{add_page}</h2>
-			<ul>
-			<li><a href="[doc_base_url][dir]emacs">{admin_emacs_add}</a></li>
-			[if user_can_use_html]
-				<li><a href="[doc_base_url][dir]ckeditor">{admin_ckeditor_add}</a></li>
-				<li><a href="[doc_base_url][dir]nicedit">{admin_nicedit_add}</a></li>
-				<li><a href="[doc_base_url][dir]tinymce">{admin_tinymce_add}</a></li>
-			[end]
-			</ul>
-		[end]
-	
-		[if item_is item_can_write]
-			<h2>{edit_page}</h2>
-			<ul>
-			<li><a href="[doc_base_url][dir][item_url]/emacs">{admin_emacs_edit}</a></li>
-			[if user_can_use_html]
-				<li><a href="[doc_base_url][dir][item_url]/ckeditor">{admin_ckeditor_edit}</a></li>
-				<li><a href="[doc_base_url][dir][item_url]/nicedit">{admin_nicedit_edit}</a></li>
-				<li><a href="[doc_base_url][dir][item_url]/tinymce">{admin_tinymce_edit}</a></li>
-			[end]
-			</ul>
-		[end]
-	
-		<h2>{admin_options}:</h2>
-		<ul>
-		<li><a href="[doc_base_url][dir]ls">{admin_ls}</a></li>
-		[if dir_can_write]<li><a href="[doc_base_url][dir]mkdir">{admin_mkdir}</a></li>[end]
-		[if dir_can_write]<li><a href="[doc_base_url][dir]upload">{admin_upload}</a></li>[end]
-		[if not item_is]<li><a href="[doc_base_url][dir]sort">{admin_sort}</a></li>[end]
-		[if any item_is item_can_remove]<li><a href="[doc_base_url][dir][item_url]/rm">{admin_rm}</a></li>[end]
-		</ul>
-	</div>
-[end]
-[end]

winixd/html/item_tab_info.html

@@ -1,4 +1,4 @@
-<p class="[if index "odd"]winix_itemtabinfo[else][if thread_mount_arg_is "subject"]winix_itemtabinfo[else]winix_itemtabinfo2[end][end]">
+<p class="uk-text-meta">
 
 	{added_by}: [item_tab_user], [item_tab_date_creation_nice][if not item_tab_dates_equal],
 		{last_modified}[if item_tab_users_different] {by}: [item_tab_modification_user],[else]:[end]

winixd/html/slog.html

@@ -1,30 +1,27 @@
 [if slog_tab]
-<table class="winix_slog">
 
 	[for slog_tab]
 
-		<tr>
-		<th class="[if slog_tab_is_error]winix_slogerror[end][if slog_tab_is_warning]winix_slogwarning[end][if slog_tab_is_info]winix_sloginfo[end]">
-
-		[if slog_tab_is_info]
-		{slog_info}:
-		[end]
+		<div class="uk-margin [if slog_tab_is_error] uk-alert-danger[end][if slog_tab_is_warning] uk-alert-warning[end][if slog_tab_is_info] uk-alert-success[end]" data-uk-alert>
 		
-		[if slog_tab_is_warning]
-		{slog_warning}:
-		[end]
+			<a class="uk-alert-close" data-uk-close></a>
 
-		[if slog_tab_is_error]
-		{slog_error}:
-		[end]
+			[if slog_tab_is_info]
+			{slog_info}:
+			[end]
 
-		</th>
-		<td>
-		[slog_tab_print]
-		</td>
-		</tr>
+			[if slog_tab_is_warning]
+			{slog_warning}:
+			[end]
+
+			[if slog_tab_is_error]
+			{slog_error}:
+			[end]
+
+			[slog_tab_print]
+
+		</div>
 
 	[end]
 
-</table>
 [end]

winixd/html/thread_sort_tab_info.html

@@ -1,4 +1,4 @@
-<p class="[if index "even"]winix_itemtabinfo[else][if thread_mount_arg_is "subject"]winix_itemtabinfo[else]winix_itemtabinfo2[end][end]">
+<p class="uk-text-meta">
 
 	{added_by}: [thread_sort_tab_user], [thread_sort_tab_date_creation_nice][if not thread_sort_tab_dates_equal],
 		{last_modified}[if thread_sort_tab_users_different] {by}: [thread_sort_tab_modification_user],[else]:[end]

winixd/locale/en

@@ -1,11 +1,14 @@
 winix_locale_id = "0"
 locale_name = "english"
 
-language = en
-charset = UTF-8
+winix_html_lang_attr = en
+
+winix_backend_info = Powered by winix
+winix_backend_tooltip = Winix - a web framework
+winix_frontend_info = Built with
+winix_frontend_tooltip = Visit UIkit 3 site
 
 logged_as = logged as
-logged_as_long = You are logged as
 
 display_guest_name = guest
 unknown = unknown
@@ -24,11 +27,21 @@ account_already_activated = This account is already activated
 account_cannot_be_activated = This account cannot be activated, please contact with the system administrator
 account_email_sent = An email with an activation link has been sent to you
 
+account_header = My Account
+account_logged_as = You are logged as:
+account_not_logged = You are not logged in.
+account_admin = Root
+account_admin_yes = yes
+account_groups = Groups
+account_timezone = Time zone
+account_language = Language
+
+
 export_header = Export
 export_transer_file_info = Press Export to transfer the file to an external ftp server
 export_transer_dir_info = Press Export to transfer the directory to an external ftp server
 export_checkbox_static_file_too = "Export static files too (images etc.)"
-
+export_button = Export
 
 code_expired = The code has expired
 password_cannot_be_changed = The password cannot be changed, please contact with the system administrator
@@ -40,7 +53,6 @@ email_sent_to = An email has been sent to:
 logout = logout
 
 
-remember_me = Remember me
 
 home_page = Home page   
 
@@ -74,7 +86,6 @@ cat_file_url = File url
 
 
 create_thread_header = Create thread
-form_thread_legend = Thread form
 button_thread_submit = Create thread
 
 url = Url
@@ -104,6 +115,12 @@ create_ticket_header = Create a new ticket
 
 
 
+
+ckeditor_update_button = Update
+ckeditor_update_progressbar_img_alt = Progressbar
+
+
+
 form_ticket_type = Ticket type
 form_ticket_status = Status
 form_ticket_priority = Priority
@@ -114,16 +131,15 @@ form_ticket_progress = "Progress (0-100)"
 form_ticket_create_submit = Create a new ticket
 form_ticket_edit_submit = Edit a ticket
 
+form_ticket_select_file = Select file
 
 env_header = Environment variables for a user
-form_env_legend = Environment variables form
 env_change_env_for_user = Change environment variables for user
 env_change_admin_env_for_user = Change admin environment variables for user
 env_change_user = Change user
 
 default_header = Default item in a directory
 default_make_redirect = Make redirect
-form_default_legend = Default item form
 
 ln_header = Link
 ln_info = Create a link in directory
@@ -131,7 +147,7 @@ ln_to = Link pointing to
 ln_hardlink = hardlink
 ln_symlink = symbolic link
 ln_make_redirect = "Make redirect (only for symbolic links)"
-form_ln_legend = Link form
+
 
 
 
@@ -158,8 +174,13 @@ last_none = There is no anything information.
 
 
 ls_header = Directory listing
-ls_pictures_in_dir = Pictures in directory 
 ls_no_picture = There are not any pictures in this directory
+ls_type = Type
+ls_permissions = Permissions
+ls_owner = Owner
+ls_group = Group
+ls_name = Name
+ls_root_dir_name = Root dir
 
 ipban_header = IP Banned
 ipban_col_id = Id
@@ -182,6 +203,16 @@ ipban_remove_all_ip = Remove all IP's from the list
 ipban_ban_list_empty = There are not any IP addresses banned at the moment.
 ipban_your_ip_is_banned = Your IP address is banned on this server until to:
 
+imgcrop_header = Image cropping
+imgcrop_crop_only_thumb_info = "Crop the thumbnail of the photo, the original (large) image will not be modified."
+imgcrop_create_new_thumb_info = "Select a frame on the photo with the mouse, a new thumbnail will be created from this part, the original (large) image will not be modified."
+imgcrop_crop_only_original_img_info = "Crop the original image (the thumbnail will not be modified)."
+imgcrop_create_new_thumb_too_info = Also create a new thumbnail
+imgcrop_no_image_info = imgcrop can only be applied to image files.
+imgcrop_table_option_crop_image = Image cropping
+imgcrop_table_option_crop_thumb = Thumbnail cropping
+imgcrop_table_option_create_new_thumb = Create a new thumbnail
+
 
 man_header = Man
 man_winix_funcions = Winix functions
@@ -190,10 +221,13 @@ man_ezc_functions = EZC templates functions
 
 meta_header = Meta
 meta_admin_header = Admin meta
+meta_for_dir = Additional information for directory
+meta_for_page = Additional information for page
+meta_admin_for_dir = Additional administrative information for directory
+meta_admin_for_page = Additional administrative information for page
 
 
 mkdir_header = Make directory
-mkdir_form_legend = Make directory form
 
 html_lang_attr_value = "en"
 language_orphans = ()
@@ -210,7 +244,6 @@ passwd_password_changed = The password has been changed
 
 
 priv_header = Permissions
-priv_form_legend = Permissions
 priv_change_in_dir = Change permissions for all items in the following directory
 priv_for_all_files = For all files to
 priv_for_all_dirs = For all directories to
@@ -225,7 +258,8 @@ pw_table_is_active = Is active
 pw_table_is_suspended = Is suspended
 pw_table_is_banned = Is banned
 pw_table_yes = yes
-pw_table_no = no
+
+# !! is it used anymore?
 pw_password_changed = Your password has been changed
 
 
@@ -239,7 +273,6 @@ reload_menu = plugin menu cache
 
 
 rm_header       = Remove
-rm_form_legend  = Remove form
 rm_file         = Do you really want to remove file
 rm_symlink      = Do you really want to remove symlink
 rm_dir          = Do you really want to remove directory
@@ -256,8 +289,7 @@ rm_content_use_r_option = Content of a directory can be removed only with 'r' pa
 
 
 rmuser_header = Remove user
-rmuser_legend = Remove user form
-rmuser_selectuser = Select a user
+rmuser_selectuser = Choose a user to delete
 rmuser_submit = Remove
 rmuser_removecurrent = Are you really want to remove your account from our service? 
 
@@ -291,7 +323,6 @@ template_header = Template
 template_info_file = Current html template for this file
 template_info_dir = Current html template for this directory
 template_from_mount_point = is taken from the mount point
-template_form_legend = Template form
 template_form_info = Select a new template
 template_form_from_mount_point = from the mount point
 
@@ -304,7 +335,10 @@ upload_button_cancel_upload = Cancel upload
 upload_button_delete = Delete
 upload_button_processing = Processing...
 upload_button_download = Download
+upload_button_edit = Edit
 upload_error = Error:
+upload_processing = Processing...
+
 
 who_header = Sessions
 who_tab_index = Ind.
@@ -331,7 +365,6 @@ admin_sort = "Sort items (sort)"
 locale_header = Locale
 locale_your_locale = Current language
 locale_has_incorrect_id = You don't have a correct language set
-locale_form_legend = Locale form
 locale_select = Select language
 
 
@@ -340,7 +373,16 @@ login_cannot_login_from_this_ip = We are sorry but you cannot login from this IP
 #We are sorry but there were too many incorrect login attempts from your IP address.
 
 login_cannot_login_available = The login process will be available since:
-
+login_currently_logged_as = You are logged as:
+login_username = Username
+login_password = Password
+login_remember_me = Remember me
+login_button = Log in
+login_forgot_password_question = Forgot your password?
+login_back_to_login_form = Back to Login
+login_forgot_password_email = E-mail
+login_forgot_password_button = Change password
+login_logout_button = Logout
 
 uptime_header = Uptime
 uptime_current_time = current time
@@ -350,15 +392,13 @@ uptime_users_logged = logged users
 uptime_days = days
 
 
-adduser_header_add = Add a user
+adduser_header_add = Add a new user
 adduser_header_register = Register
-adduser_form_legend = Register user form
 adduser_login = Login
 adduser_password = Password
 adduser_confirm_password = Confirm password
 adduser_email = You can also provide your email address. If you ever forget your password we will be able send you the password back.
-adduser_need_email = You have to provide your email address.
-adduser_need_email2 = We send you an email with an activation link
+adduser_need_email = You have to provide your email address. We send you an email with an activation link
 adduser_submit = Add user
 register_user_submit = Register
 adduser_err_login_empty = Provide a login please.
@@ -387,7 +427,6 @@ mount_current = Current mount point
 
 
 mv_header = Move
-mv_form_legend = Move form
 mv_page = Move page
 mv_dir = Move directory
 mv_only_content = Move only content of the directory
@@ -399,16 +438,15 @@ mv_dir_content_can_be_moved_to_dir = Directory content can be moved only to an o
 mv_cannot_move_to_inside = A directory cannot be moved to inside it
 mv_incorrect_dst_path = Incorrect destination path
 mv_incorrect_dir = Incorrect directory
+mv_file_exists = Such file already exists
 
 
 timezone_header = Time Zone
-timezone_form_legend = Time Zone form
 timezone_select = Select your time zone
 timezone_your_zone = Your current time zone is
 timezone_has_incorrect_id = You don't have a correct time zone set
 
 cp_header = Copy
-cp_form_legend = Copy form
 cp_page = Copy page
 cp_dir = Copy directory
 cp_only_content = Copy only content of the directory
@@ -433,6 +471,7 @@ slog_turn_over = Session's log turned over due to size greater than
 sort_header = Sort
 sort_current_sortindex = Current sort index
 sort_info_multi = Set an order of items by using the mouse.
+sort_info_multi_index = Set an order of items by providing an index number. You can also set an order of items by using the mouse and then clicking the renumerate button.
 sort_item_subject = Subject:
 
 stat_header = Stat
@@ -453,6 +492,8 @@ stat_template_from_mount_point = from the mount point
 subject_header = Edit subject
 
 
+tinymce_update_button = Update
+tinymce_update_progressbar_img_alt = Progressbar
 
 uname_header = Uname
 uname_available_plugins = Available plugins
@@ -617,6 +658,10 @@ tz_+13:00 =  Nuku'alofa
 tz_+13:00b =  Samoa
 
 
+seo_title = Seo
+seo_description = Description
+seo_keywords = Keywords
+
 
 
 

winixd/locale/pl

@@ -1,12 +1,14 @@
 winix_locale_id = "1"
 locale_name = "polski"
 
+winix_html_lang_attr = pl
 
-language = pl
-charset = UTF-8
+winix_backend_info = Napędzany przez Winix
+winix_backend_tooltip = Winix - www framework
+winix_frontend_info = Zbudowany z 
+winix_frontend_tooltip = Odwiedź stronę UIkit 3
 
 logged_as = zalogowany jako    
-logged_as_long = Aktualnie jesteś zalogowany jako
 
 display_guest_name = gość
 unknown = nie znany
@@ -26,12 +28,21 @@ account_already_activated = To konto jest już aktywowane
 account_cannot_be_activated = To konto nie może być aktywowane, proszę skontaktować się z administratorem
 account_email_sent = Wysłaliśmy Tobie email z linkiem aktywacyjnym
 
+account_header = Moje konto
+account_logged_as = Jesteś zalogowany jako:
+account_not_logged = Nie jesteś zalogowany.
+account_admin = Administrator
+account_admin_yes = tak
+account_groups = Grupy
+account_timezone = Strefa czasowa
+account_language = Język
+
 
 export_header = Export
 export_transer_file_info = Wciśnij przycisk Export aby wysłać ten plik na zewnętrzny serwer ftp
 export_transer_dir_info = Wciśnij przycisk Export aby wysłać podany katalog na zewnętrzny serwer ftp
 export_checkbox_static_file_too = "Wyślij także pliki statyczne (zdjęcia itp.)"
-
+export_button = Export
 
 code_expired = Ten kod stracił już swoją ważność
 password_cannot_be_changed = Niestety nie możemy zmienić hasła dla tego konta, proszę skontaktować się z administratorem
@@ -45,7 +56,6 @@ email_sent_to = Wiadomość została wysłana do:
 logout = wyloguj
 
 
-remember_me = Zapamiętaj mnie
 
 home_page = Strona główna   
 
@@ -80,7 +90,6 @@ cat_file_url = Adres pliku
 
 
 create_thread_header = Załóż wątek
-form_thread_legend = Wypełnij wszystkie pozycje formularza
 button_thread_submit = Załóż wątek
 
 url = Url
@@ -110,6 +119,13 @@ create_ticket_header = Nowe zgłoszenie
 
 
 
+
+
+ckeditor_update_button = Aktualizuj
+ckeditor_update_progressbar_img_alt = Progressbar
+
+
+
 form_ticket_type = Rodzaj zgłoszenia
 form_ticket_status = Status
 form_ticket_priority = Priorytet
@@ -120,16 +136,16 @@ form_ticket_progress = "Postęp prac (0-100)"
 form_ticket_create_submit = Załóż zgłoszenie
 form_ticket_edit_submit = Edytuj zgłoszenie
 
+form_ticket_select_file = Wybierz plik
+
 env_header = Zmienne środowiskowe
-form_env_legend = Formularz zmiany zmiennych środowiskowych dla użytkownika
 env_change_env_for_user = Zmień zmienne środowiskowe dla użytkownika
 env_change_admin_env_for_user = Zmień zmienne środowiskowe administracyjne dla użytkownika
 env_change_user = Zmień użytkownika
 
 
-default_header = Domyślna pozycja w katalogu
+default_header = Domyślny element w katalogu
 default_make_redirect = Wykonaj przekierowanie
-form_default_legend = Formularz zmiany pozycji domyślnej
 
 ln_header = Link
 ln_info = Stwórz link w katalogu
@@ -137,14 +153,14 @@ ln_to = Link wskazujący na
 ln_hardlink = hard link
 ln_symlink = link symboliczny
 ln_make_redirect = "Wykonaj przekierowanie (jedynie dla linków symbolicznych)"
-form_ln_legend = Formularz zmiany linku
 
 
-form_emacs_content_cms = Zawartość:
-form_emacs_content_thread = Post:
-form_emacs_content_ticket = Opis:
 
-form_emacs_content_type = Rodzaj wiadomości:
+form_emacs_content_cms = Zawartość
+form_emacs_content_thread = Post
+form_emacs_content_ticket = Opis
+
+form_emacs_content_type = Rodzaj wiadomości
 
 form_emacs_content_type_text = text
 form_emacs_content_type_formatted_text = sformatowany text
@@ -162,9 +178,13 @@ last_none = Nie ma dostępnych żadnych informacji.
 
 
 ls_header = Zawartość katalogu
-ls_pictures_in_dir = Obrazy w katalogu
 ls_no_picture = W tym katalogu nie ma żadnego obrazu
-
+ls_type = Typ
+ls_permissions = Uprawnienia
+ls_owner = Właściciel
+ls_group = Grupa
+ls_name = Nazwa
+ls_root_dir_name = Katalog główny
 
 ipban_header = Lista zbanowanych adresów IP
 ipban_col_id = L.p.
@@ -187,9 +207,22 @@ ipban_remove_all_ip = Usuń wszystkie adresy IP z listy
 ipban_ban_list_empty = W tej chwili nie ma żadnych zbanowanych adresów IP.
 ipban_your_ip_is_banned = Twój adres IP jest zablokowany aż do:
 
+imgcrop_header = Kadrowanie obrazów
+imgcrop_crop_only_thumb_info = "Kadruj miniaturę zdjęcia, obraz oryginalny (duży) nie zostanie zmodyfikowany."
+imgcrop_create_new_thumb_info = "Zaznacz myszką kadr na zdjęciu, z tej części zostanie stworzona nowa miniatura, obraz oryginalny (duży) nie zostanie zmodyfikowany."
+imgcrop_crop_only_original_img_info = "Kadruj oryginalny obraz (miniatura nie zostanie zmodyfikowana)."
+imgcrop_create_new_thumb_too_info = Stwórz także nową miniaturę
+imgcrop_no_image_info = imgcrop może być zastosowany tylko do plików graficznych.
+imgcrop_table_option_crop_image = Kadruj zdjęcie
+imgcrop_table_option_crop_thumb = Kadruj miniature
+imgcrop_table_option_create_new_thumb = Stwórz nową miniature
 
 meta_header = Meta
 meta_admin_header = Admin meta
+meta_for_dir = Dodatkowe informacje dla katalogu
+meta_for_page = Dodatkowe informacje dla strony
+meta_admin_for_dir = Dodatkowe informacje administracyjne dla katalogu
+meta_admin_for_page = Dodatkowe informacje administracyjne dla strony
 
 
 man_header = Man
@@ -198,7 +231,6 @@ man_ezc_functions = Funkcje szablonów EZC
 
 
 mkdir_header = Stwórz katalog
-mkdir_form_legend = Wypełnij wszystkie pozycje formularza
 
 html_lang_attr_value = "pl"
 
@@ -233,7 +265,6 @@ passwd_password_changed = Hasło zostało zmienione
 
 
 priv_header = Zmień uprawnienia dostępu
-priv_form_legend = Uprawnienia
 priv_change_in_dir = Zmień hurtowo uprawnienia w katalogu
 priv_for_all_files = Dla wszystkich plików na
 priv_for_all_dirs = Dla wszystkich katalogów na
@@ -249,7 +280,8 @@ pw_table_is_active = Aktywny
 pw_table_is_suspended = Wstrzymany
 pw_table_is_banned = Zbanowany
 pw_table_yes = tak
-pw_table_no = nie
+
+# !! is it used anymore?
 pw_password_changed = Twoje hasło zostało zmienione
 
 
@@ -263,7 +295,6 @@ reload_menu = cache pluginu 'menu'
 
 
 rm_header       = Usuń
-rm_form_legend  = Formularz usuwania
 rm_file         = Czy napewno usunąć plik
 rm_symlink      = Czy napewno usunąć symlink
 rm_dir          = Czy napewno usunąć katalog
@@ -279,8 +310,7 @@ rm_cannot_remove_root_dir = Nie możesz usunąć głównego katalogu
 rm_content_use_r_option = Zawartość katalogu może zostać usunięta tylko z użyciem parametru 'r'
 
 rmuser_header = Usuń użytkownika
-rmuser_legend = Formularz usunięcia użytkownika
-rmuser_selectuser = Wybierz użytkownika
+rmuser_selectuser = Wybierz użytkownika do usunięcia
 rmuser_submit = Usuń
 rmuser_removecurrent = Naprawdę chcesz usunąć swoje konto z naszego serwisu? 
 
@@ -312,7 +342,6 @@ template_header = Szablon
 template_info_file = Bieżący szablon dla tego pliku
 template_info_dir = Bieżący szablon dla tego katalogu
 template_from_mount_point = jest brany z punktu montowania
-template_form_legend = Formularz zmiany szablonu
 template_form_info = Wybierz nowy szablon
 template_form_from_mount_point = z punktu montowania
 
@@ -326,7 +355,9 @@ upload_button_cancel_upload = Przerwij wysyłanie
 upload_button_delete = Usuń
 upload_button_processing = Wysyłanie...
 upload_button_download = Ściągnij
+upload_button_edit = Edytuj
 upload_error = Błąd:
+upload_processing = Przygotowywanie...
 
 who_header = Lista sesji
 who_tab_index = L.p.
@@ -352,7 +383,6 @@ admin_sort = "Sortuj elementy (sort)"
 locale_header = Ustawienia językowe
 locale_your_locale = Bieżący język
 locale_has_incorrect_id = Nie masz prawidłowo ustawionego bieżącego języka
-locale_form_legend = Formularz ustawienia języka
 locale_select = Wybierz język
 
 
@@ -361,6 +391,16 @@ login_cannot_login_from_this_ip = Przepraszamy ale nie możesz się zalogować z
 #Przepraszamy ale z twojego adresu IP było zbyt wiele prób nieprawidłowego logowania. 
 
 login_cannot_login_available = Ponowne logowanie będzie możliwe dopiero od:
+login_currently_logged_as = Aktualnie jesteś zalogowany jako:
+login_username = Użytkownik
+login_password = Hasło
+login_remember_me = Zapamiętaj mnie
+login_button = Zaloguj
+login_forgot_password_question = Zapomniałeś hasła?
+login_back_to_login_form = Powrót do logowania
+login_forgot_password_email = E-mail
+login_forgot_password_button = Zmień hasło
+login_logout_button = Wyloguj
 
 uptime_header = Czas pracy systemu
 uptime_current_time = aktualna godzina
@@ -372,13 +412,11 @@ uptime_days = dni
 
 adduser_header_add = Dodaj użytkownika
 adduser_header_register = Zarejestruj się
-adduser_form_legend = Formularz rejestracji nowego użytkownika
 adduser_login = Login
 adduser_password = Hasło
 adduser_confirm_password = Potwierdź hasło
 adduser_email = Możesz także podać swój email. Jeśli zapomnisz kiedyś hasła to hasło zostanie wysłane na podany email
-adduser_need_email = Wymagamy abyś podał nam swój adres email,
-adduser_need_email2 = na ten adres wyślemy wiadomość z linkiem aktywacyjnym
+adduser_need_email = Wymagamy abyś podał nam swój adres email, na ten adres wyślemy wiadomość z linkiem aktywacyjnym.
 adduser_submit = Dodaj użytkownika
 register_user_submit = Rejestruj
 adduser_err_login_empty = Proszę podać login.
@@ -393,7 +431,7 @@ adduser_err_password_too_big = Hasło nie może być większe niż
 adduser_err_password_too_big2 = znaków
 adduser_err_email_too_big = Adres email nie może być większy niż
 adduser_err_email_too_big2 = znaków
-adduser_auto_activate = Automatically activate this account
+adduser_auto_activate = Aktywuj automatycznie to konto
 adduser_err_email_incorrect = Podany email jest nieprawidłowy
 
 
@@ -407,7 +445,6 @@ mount_current = Bieżący punkt montowania
 
 
 mv_header = Przenieś
-mv_form_legend = Formularz zmiany
 mv_page = Przenieś stronę
 mv_dir = Przenieś katalog
 mv_only_content = Przenieś tylko zawartość katalogu
@@ -419,17 +456,15 @@ mv_dir_content_can_be_moved_to_dir = Zawartość katalogu może zostać przenies
 mv_cannot_move_to_inside = Nie mogę przenieść katalogu do jego środka
 mv_incorrect_dst_path = Nieprawidłowa ścieżka docelowa
 mv_incorrect_dir = Nieprawidłowy katalog
-
+mv_file_exists = Podany plik już istnieje
 
 timezone_header = Strefa czasowa
-timezone_form_legend = Formularz wyboru strefy czasowej
 timezone_select = Wybierz swoją strefę czasową
 timezone_your_zone = Twoja aktualna strefa czasowa to
 timezone_has_incorrect_id = Nie masz prawidłowo ustawionej strefy czasowej
 
 
 cp_header = Kopiuj
-cp_form_legend = Formularz kopiowania
 cp_page = Kopiuj stronę
 cp_dir = Kopiuj katalog
 cp_only_content = Kopiuj tylko zawartość katalogu
@@ -453,6 +488,7 @@ slog_turn_over = Log sesji wyczyszczony w związku z przekroczeniem wielkości
 sort_header = Sortuj
 sort_current_sortindex = Bieżący indeks sortowania
 sort_info_multi = Ustaw kolejność elementów przeciągając je przy pomocy myszki.
+sort_info_multi_index = Ustaw kolejność elementów podająć ich indeks. Możesz także ustawić kolejność elementów przeciągając je przy pomocy myszki i następnie kliknąć przycisk Renumeruj.
 sort_item_subject = Tytuł:
 
 stat_header = Stat
@@ -473,6 +509,9 @@ stat_template_from_mount_point = z punktu montowania
 subject_header = Zmień tytuł
 
 
+tinymce_update_button = Aktualizuj
+tinymce_update_progressbar_img_alt = Progressbar
+
 uname_header = Nazwa systemu
 uname_available_plugins = Dostępne pluginy
 uname_plugin_unknown = Plugin nie ustawił swojej nazwy
@@ -635,6 +674,11 @@ tz_+13:00 =  Nuku'alofa
 tz_+13:00b =  Samoa
 
 
+seo_title = Seo
+seo_description = "Opis (tag meta description)"
+seo_keywords = "Słowa kluczowe (tag meta keywords)"
+
+
 
 
 

winixd/main/Makefile.dep

@@ -48,15 +48,15 @@ main.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 main.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 main.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 main.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-main.o: ../../../morm/src/baseexpression.h ../../../morm/src/flatexpression.h
-main.o: ../../../morm/src/finder.h ../../../morm/src/cursor.h
-main.o: ../../../morm/src/jsonexpression.h
+main.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+main.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+main.o: ../../../morm/src/finderhelper.h ../../../morm/src/fieldvaluehelper.h
+main.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
+main.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 main.o: ../../../morm/src/postgresqlexpression.h
-main.o: ../../../morm/src/dochtmlexpression.h
 main.o: ../../../morm/src/jsonconnector.h
 main.o: ../../../morm/src/postgresqlconnector.h
 main.o: ../../../morm/src/postgresqlqueryresult.h
-main.o: ../../../morm/src/dochtmlconnector.h
 main.o: ../../../winix/winixd/core/ipbancontainer.h
 main.o: ../../../winix/winixd/core/lastcontainer.h
 main.o: ../../../winix/winixd/core/system.h ../../../winix/winixd/core/job.h

winixd/notify/Makefile.dep

@@ -42,15 +42,16 @@ notify.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h
 notify.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h
 notify.o: ../../../morm/src/dbconnector.h ../../../morm/src/queryresult.h
 notify.o: ../../../morm/src/flatconnector.h ../../../morm/src/dbexpression.h
-notify.o: ../../../morm/src/baseexpression.h
+notify.o: ../../../morm/src/baseexpression.h ../../../morm/src/modelenv.h
+notify.o: ../../../morm/src/modeldata.h ../../../morm/src/cursorhelper.h
+notify.o: ../../../morm/src/finderhelper.h
+notify.o: ../../../morm/src/fieldvaluehelper.h
 notify.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
 notify.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
 notify.o: ../../../morm/src/postgresqlexpression.h
-notify.o: ../../../morm/src/dochtmlexpression.h
 notify.o: ../../../morm/src/jsonconnector.h
 notify.o: ../../../morm/src/postgresqlconnector.h
-notify.o: ../../../morm/src/postgresqlqueryresult.h
-notify.o: ../../../morm/src/dochtmlconnector.h templatesnotify.h
+notify.o: ../../../morm/src/postgresqlqueryresult.h templatesnotify.h
 notify.o: ../../../winix/winixd/core/textstream.h
 notify.o: ../../../winix/winixd/core/users.h
 notify.o: ../../../winix/winixd/core/user.h
@@ -172,20 +173,22 @@ notifythread.o: ../../../morm/src/queryresult.h
 notifythread.o: ../../../morm/src/flatconnector.h
 notifythread.o: ../../../morm/src/dbexpression.h
 notifythread.o: ../../../morm/src/baseexpression.h
+notifythread.o: ../../../morm/src/modelenv.h ../../../morm/src/modeldata.h
+notifythread.o: ../../../morm/src/cursorhelper.h
+notifythread.o: ../../../morm/src/finderhelper.h
+notifythread.o: ../../../morm/src/fieldvaluehelper.h
 notifythread.o: ../../../morm/src/flatexpression.h ../../../morm/src/finder.h
-notifythread.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h
+notifythread.o: ../../../pikotools/utf8/utf8.h ../../../morm/src/cursor.h
+notifythread.o: ../../../morm/src/jsonexpression.h
 notifythread.o: ../../../morm/src/postgresqlexpression.h
-notifythread.o: ../../../morm/src/dochtmlexpression.h
 notifythread.o: ../../../morm/src/jsonconnector.h
 notifythread.o: ../../../morm/src/postgresqlconnector.h
-notifythread.o: ../../../morm/src/postgresqlqueryresult.h
-notifythread.o: ../../../morm/src/dochtmlconnector.h templatesnotify.h
+notifythread.o: ../../../morm/src/postgresqlqueryresult.h templatesnotify.h
 notifythread.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
 notifythread.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h
 notifythread.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h
-notifythread.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h
-notifythread.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
-notifythread.o: ../../../ezc/src/outstreams.h
+notifythread.o: ../../../ezc/src/funinfo.h ../../../ezc/src/objects.h
+notifythread.o: ../../../ezc/src/pattern.h ../../../ezc/src/outstreams.h
 notifythread.o: ../../../ezc/src/expressionparser.h
 notifythread.o: ../../../ezc/src/patternparser.h
 notifythread.o: ../../../winix/winixd/core/textstream.h

winixd/plugins/export/Makefile.dep

@@ -61,15 +61,16 @@ edb.o: ../../../../morm/src/modelconnector.h ../../../../morm/src/clearer.h
 edb.o: ../../../../morm/src/dbconnector.h ../../../../morm/src/queryresult.h
 edb.o: ../../../../morm/src/flatconnector.h
 edb.o: ../../../../morm/src/dbexpression.h
-edb.o: ../../../../morm/src/baseexpression.h
+edb.o: ../../../../morm/src/baseexpression.h ../../../../morm/src/modelenv.h
+edb.o: ../../../../morm/src/modeldata.h ../../../../morm/src/cursorhelper.h
+edb.o: ../../../../morm/src/finderhelper.h
+edb.o: ../../../../morm/src/fieldvaluehelper.h
 edb.o: ../../../../morm/src/flatexpression.h ../../../../morm/src/finder.h
 edb.o: ../../../../morm/src/cursor.h ../../../../morm/src/jsonexpression.h
 edb.o: ../../../../morm/src/postgresqlexpression.h
-edb.o: ../../../../morm/src/dochtmlexpression.h
 edb.o: ../../../../morm/src/jsonconnector.h
 edb.o: ../../../../morm/src/postgresqlconnector.h
 edb.o: ../../../../morm/src/postgresqlqueryresult.h
-edb.o: ../../../../morm/src/dochtmlconnector.h
 exportinfo.o: ../../../../winix/winixd/core/log.h exportinfo.h
 exportinfo.o: ../../../../winix/winixd/core/system.h
 exportinfo.o: ../../../../winix/winixd/core/job.h
@@ -107,15 +108,19 @@ exportinfo.o: ../../../../morm/src/queryresult.h
 exportinfo.o: ../../../../morm/src/flatconnector.h
 exportinfo.o: ../../../../morm/src/dbexpression.h
 exportinfo.o: ../../../../morm/src/baseexpression.h
+exportinfo.o: ../../../../morm/src/modelenv.h
+exportinfo.o: ../../../../morm/src/modeldata.h
+exportinfo.o: ../../../../morm/src/cursorhelper.h
+exportinfo.o: ../../../../morm/src/finderhelper.h
+exportinfo.o: ../../../../morm/src/fieldvaluehelper.h
 exportinfo.o: ../../../../morm/src/flatexpression.h
-exportinfo.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
+exportinfo.o: ../../../../morm/src/finder.h ../../../../pikotools/utf8/utf8.h
+exportinfo.o: ../../../../morm/src/cursor.h
 exportinfo.o: ../../../../morm/src/jsonexpression.h
 exportinfo.o: ../../../../morm/src/postgresqlexpression.h
-exportinfo.o: ../../../../morm/src/dochtmlexpression.h
 exportinfo.o: ../../../../morm/src/jsonconnector.h
 exportinfo.o: ../../../../morm/src/postgresqlconnector.h
 exportinfo.o: ../../../../morm/src/postgresqlqueryresult.h
-exportinfo.o: ../../../../morm/src/dochtmlconnector.h
 exportinfo.o: ../../../../winix/winixd/core/dirs.h
 exportinfo.o: ../../../../winix/winixd/core/item.h
 exportinfo.o: ../../../../winix/winixd/core/dircontainer.h
@@ -136,7 +141,6 @@ exportinfo.o: ../../../../winix/winixd/core/textstream.h
 exportinfo.o: ../../../../winix/winixd/templates/htmltextstream.h
 exportinfo.o: ../../../../winix/winixd/core/textstream.h
 exportinfo.o: ../../../../winix/winixd/core/misc.h
-exportinfo.o: ../../../../pikotools/utf8/utf8.h
 exportinfo.o: ../../../../winix/winixd/core/winix_const.h
 exportinfo.o: ../../../../pikotools/convert/convert.h
 exportinfo.o: ../../../../pikotools/convert/inttostr.h
@@ -275,15 +279,17 @@ funexport.o: ../../../../morm/src/queryresult.h
 funexport.o: ../../../../morm/src/flatconnector.h
 funexport.o: ../../../../morm/src/dbexpression.h
 funexport.o: ../../../../morm/src/baseexpression.h
+funexport.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h
+funexport.o: ../../../../morm/src/cursorhelper.h
+funexport.o: ../../../../morm/src/finderhelper.h
+funexport.o: ../../../../morm/src/fieldvaluehelper.h
 funexport.o: ../../../../morm/src/flatexpression.h
 funexport.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
 funexport.o: ../../../../morm/src/jsonexpression.h
 funexport.o: ../../../../morm/src/postgresqlexpression.h
-funexport.o: ../../../../morm/src/dochtmlexpression.h
 funexport.o: ../../../../morm/src/jsonconnector.h
 funexport.o: ../../../../morm/src/postgresqlconnector.h
 funexport.o: ../../../../morm/src/postgresqlqueryresult.h
-funexport.o: ../../../../morm/src/dochtmlconnector.h
 funexport.o: ../../../../winix/winixd/core/dirs.h
 funexport.o: ../../../../winix/winixd/core/dircontainer.h
 funexport.o: ../../../../winix/winixd/core/request.h
@@ -375,15 +381,17 @@ init.o: ../../../../morm/src/modelconnector.h ../../../../morm/src/clearer.h
 init.o: ../../../../morm/src/dbconnector.h ../../../../morm/src/queryresult.h
 init.o: ../../../../morm/src/flatconnector.h
 init.o: ../../../../morm/src/dbexpression.h
-init.o: ../../../../morm/src/baseexpression.h
+init.o: ../../../../morm/src/baseexpression.h ../../../../morm/src/modelenv.h
+init.o: ../../../../morm/src/modeldata.h ../../../../morm/src/cursorhelper.h
+init.o: ../../../../morm/src/finderhelper.h
+init.o: ../../../../morm/src/fieldvaluehelper.h
 init.o: ../../../../morm/src/flatexpression.h ../../../../morm/src/finder.h
-init.o: ../../../../morm/src/cursor.h ../../../../morm/src/jsonexpression.h
+init.o: ../../../../pikotools/utf8/utf8.h ../../../../morm/src/cursor.h
+init.o: ../../../../morm/src/jsonexpression.h
 init.o: ../../../../morm/src/postgresqlexpression.h
-init.o: ../../../../morm/src/dochtmlexpression.h
 init.o: ../../../../morm/src/jsonconnector.h
 init.o: ../../../../morm/src/postgresqlconnector.h
 init.o: ../../../../morm/src/postgresqlqueryresult.h
-init.o: ../../../../morm/src/dochtmlconnector.h
 init.o: ../../../../winix/winixd/core/dirs.h
 init.o: ../../../../winix/winixd/core/item.h
 init.o: ../../../../winix/winixd/core/dircontainer.h
@@ -403,7 +411,6 @@ init.o: ../../../../winix/winixd/core/textstream.h
 init.o: ../../../../winix/winixd/templates/htmltextstream.h
 init.o: ../../../../winix/winixd/core/textstream.h
 init.o: ../../../../winix/winixd/core/misc.h
-init.o: ../../../../pikotools/utf8/utf8.h
 init.o: ../../../../winix/winixd/core/winix_const.h
 init.o: ../../../../pikotools/convert/convert.h
 init.o: ../../../../pikotools/convert/inttostr.h

winixd/plugins/export/exportthread.cpp

@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2011-2018, Tomasz Sowa
+ * Copyright (c) 2011-2019, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -183,10 +183,7 @@ void ExportThread::DoMessage()
 		if( message_work.errors > conn_max_errors )
 		{
 			message_work.can_remove = true;
-
-			Lock();
 			log << log1 << "Export: too many errors for uploading " << message_work.path << " (skipping)" << logend << logsave;
-			Unlock();
 		}
 	}
 }
@@ -206,9 +203,7 @@ bool ExportThread::Fetch(const char * url)
 
 	if( !curl )
 	{
-		Lock();
 		log << log1 << "Export: I can't use curl" << logend;
-		Unlock();
 		return false;
 	}
 
@@ -232,9 +227,7 @@ bool ExportThread::Fetch(const char * url)
 
 	if( res != 0 )
 	{
-		Lock();
 		log << log1 << "Export: download failed: " << error_buf << logend << logsave;
-		Unlock();
 		return false;
 	}
 	
@@ -288,9 +281,7 @@ FILE * file = 0;
 
 		if( !file )
 		{
-			Lock();
 			log << log1 << "Export: I cannot open the file: " << local_path << logend;
-			Unlock();
 			return false;
 		}
 		else
@@ -307,9 +298,7 @@ FILE * file = 0;
 
 	if( !curl )
 	{
-		Lock();
 		log << log1 << "Export: I can't use curl (sending)" << logend;
-		Unlock();
 
 		if( file )
 			fclose(file);
@@ -355,16 +344,12 @@ FILE * file = 0;
 
 	if( res != 0 )
 	{
-		Lock();
 		log << log1 << "Export: upload failed: " << error_buf << " (" << ftp_server << ")" << logend << logsave;
-		Unlock();
 		return false;
 	}
 	else
 	{
-		Lock();
 		log << log2 << "Export: uploaded: " << ftp_server << logend << logsave;
-		Unlock();
 	}
 	
 return true;