diff --git a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php b/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php
index 7231aac..7437f24 100644
--- a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php
+++ b/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php
@@ -485,7 +485,8 @@ function wkBoxMediaGalleryHtml($wkGals){
if(empty($wkGals)) return "";
$retHtml = "";
-$retHtml .= "
";
+
+$retHtml .= "
";
foreach($wkGals as $wkGal){
$retHtml.=
@@ -511,7 +512,7 @@ foreach($wkGals as $wkGal){
$retHtml .= "";
}
-$retHtml .= "
"; // Ende galImgList
+$retHtml .= "
"; // Ende wkBoxMediaGallery
return $retHtml;
}
diff --git a/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.ftpUpload b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.ftpUpload
new file mode 100644
index 0000000..9a08228
--- /dev/null
+++ b/homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.ftpUpload
@@ -0,0 +1,18 @@
+include Makefile.cfg
+
+ftpServer = ftpupload.net
+ftpUser = unaux_22935783
+ftpPassword = eeloor0D
+
+ftpPathBase = /htdocs/videoalben/videoalben.2018
+
+vidGalIndexPhp = /d/temp/cwsvJudo/homepage/redesign2018/markdownExperiment/src/galleryTemplates/indexHier.php
+
+
+.PHONY: all
+all:
+
+.PHONY: ftpUpload
+ftpUpload:
+ lftp -e 'set net:limit-rate 25600; mkdir -f $(ftpPathBase)/$(VID_GAL_DIR); mkdir -f $(ftpPathBase)/$(VID_GAL_DIR)/thumbnails; mkdir -f $(ftpPathBase)/$(VID_GAL_DIR)/webm; put $(vidGalIndexPhp) -o $(ftpPathBase)/$(VID_GAL_DIR)/index.php; put videos/config.inc.php -o $(ftpPathBase)/$(VID_GAL_DIR)/config.inc.php; mirror -R --ignore-time videos/thumbnails $(ftpPathBase)/$(VID_GAL_DIR)/thumbnails; mirror -R --ignore-time videos/webm $(ftpPathBase)/$(VID_GAL_DIR)/webm;quit' -u $(ftpUser),$(ftpPassword) ftp://$(ftpServer)
+
diff --git a/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-mainNav.css b/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-mainNav.css
index d8e70e2..a927b90 100644
--- a/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-mainNav.css
+++ b/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-mainNav.css
@@ -2,8 +2,8 @@
display: flex;
flex-direction: column;
align-items: stretch;
+ justify-content: space-between;
font-family: 'Orbitron-Medium', sans-serif;
-/* line-height: 1.6;*/
margin: .5em 0;
padding: 0;
border: 1px solid #a2a2a2;
@@ -45,20 +45,16 @@
}
-
-
-/* =================================
- Media Queries
-==================================== */
-
-
+/*
+ * Media Queries
+*/
@media (min-width: 640px) {
#mainNav {
display: flex;
flex-direction: row;
- align-items: flex-end;
+/* align-items: flex-end;*/
}
#mainNav > a{
padding: .5em .5em;
diff --git a/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-wkKalender.css b/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-wkKalender.css
index dcf2ce0..c75e16c 100644
--- a/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-wkKalender.css
+++ b/homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-wkKalender.css
@@ -822,3 +822,16 @@
line-height: 2;
padding: 0 10%;
}
+
+/*
+ * Die Galerie der Galerien in der wkInfoBox
+*/
+.wkBoxMediaGallery{
+ display: flex;
+ flex-flow: row wrap;
+ justify-content: space-around;
+ align-items: center;
+}
+.wkBoxMediaGallery > *{
+ flex-basis:50%;
+}
diff --git a/homepage/redesign2018/markdownExperiment/src/galleryTemplates/indexHier.php b/homepage/redesign2018/markdownExperiment/src/galleryTemplates/indexHier.php
new file mode 100644
index 0000000..b9813ff
--- /dev/null
+++ b/homepage/redesign2018/markdownExperiment/src/galleryTemplates/indexHier.php
@@ -0,0 +1,7 @@
+" : $wkName;
+
+ include_once( $_SERVER['DOCUMENT_ROOT']."/ressourcen/phpLib/videoGallery/videoGallery.tmpl.php" );
+?>
diff --git a/homepage/redesign2018/markdownExperiment/src/galleryTemplates/indexInArbeit.php b/homepage/redesign2018/markdownExperiment/src/galleryTemplates/indexInArbeit.php
new file mode 100644
index 0000000..ca8c976
--- /dev/null
+++ b/homepage/redesign2018/markdownExperiment/src/galleryTemplates/indexInArbeit.php
@@ -0,0 +1,20 @@
+
+
+
+
+ In Arbeit
+
+
+
+
+ Die Videos des Wettkampfes sind momentan noch in Vorbereitung. Einfach später noch mal probieren.
+
+ Wer ganz ungeduldig ist, kann ja schon mal kiebitzen.
+
+
diff --git a/homepage/redesign2018/markdownExperiment/wkParticipo/lib/wkParticipo-userAttribute.php b/homepage/redesign2018/markdownExperiment/wkParticipo/lib/wkParticipo-userAttribute.php
new file mode 100644
index 0000000..a9da008
--- /dev/null
+++ b/homepage/redesign2018/markdownExperiment/wkParticipo/lib/wkParticipo-userAttribute.php
@@ -0,0 +1,180 @@
+ "ISO-8859-1", "outCharset" => "UTF-8" ) ){
+//echo("Doing ".$aQueryString);
+var_dump($aBindArray);
+if( empty($someOptions['dbCharset']) ) $someOptions['dbCharset'] = "ISO-8859-1";
+if( empty($someOptions['outCharset']) ) $someOptions['outCharset'] = "UTF-8";
+/// @toDo: Bisher wird nur die Rückgabe konvertiert. Eigentlich muss
+/// doch auch die Eingabe konvertiert werden. Aber das jetzt
+/// umzustellen wird schwer! Die User m Wettkampfplaner sind ja z.B.
+/// als UTF8 in latin1(?) gespeichert.
+ try{
+ $pdoStatement = $aDbConnection->prepare( $aQueryString );
+ foreach( $aBindArray as $bindName => $bind ){
+ $pdoStatement->bindValue(
+ $bindName,
+ $bind['value'],
+ (isset($bind['data_type'])?$bind['data_type']:PDO::PARAM_STR)
+ );
+ }
+ $pdoStatement->execute();
+ $ret = $pdoStatement->fetchAll(PDO::FETCH_ASSOC);
+ }
+ catch(PDOException $db_error){
+ print "Error!: " . $db_error->getMessage() . "
";
+ return null;
+ }
+ //var_dump($ret);
+// Zeichensatzkonvertierung
+ if( is_array($ret) ){
+ foreach($ret as &$entry){
+ array_walk(
+ $entry,
+ function (&$value, $key, $someOptions) {
+ $value = iconv($someOptions['dbCharset'], $someOptions['outCharset'], $value);
+ },
+ $someOptions
+ );
+ }
+ }
+return $ret;
+}
+
+function array2htmlTableString($anArray){
+$ret = "";
+ if( !is_array($anArray) )
+ return "";
+ $ret .= "";
+ foreach($anArray as $row){
+ if( !is_array($anArray) )
+ continue;
+ $ret .= "";
+ foreach( $row as $entry )
+ $ret .= "| ".$entry." | ";
+ $ret .= "
";
+ }
+ $ret .= "
";
+return $ret;
+}
+
+function giveUserAnUserAttribute($aDbConnection, $anUserId, $anAttributeId){
+echo("Entering giveUserAnUserAttribute!");
+ try{
+ dbQuery(
+ $aDbConnection,
+ "INSERT INTO `wkParticipo_user<=>userAttributes` (userId, attributeId) VALUES (:userId, :attributeId);",
+ array(
+ ':userId' => array('value'=>$anUserId, 'data_type'=>PDO::PARAM_INT),
+ ':attributeId'=>array('value'=>$anAttributeId, 'data_type'=>PDO::PARAM_INT)
+ )
+ );
+ }
+ catch(PDOException $db_error){
+ print "Error!: " . $db_error->getMessage() . "
";
+ }
+return;
+}
+
+#exit();
+
+var_dump($_GET);
+
+$actions = ["giveUserAnUserAttribute"];
+
+
+$dbConn = getCwsvJudoDbConn();
+$dbConn->setAttribute( PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION );
+
+if(isset($_GET['action'])){
+ switch($_GET['action']){
+ case "giveUserAnUserAttribute":
+ //echo("Doing giveUserAnUserAttribute!");
+ try{
+ giveUserAnUserAttribute($dbConn, intval($_GET['userIdToGetAttribute']), intval($_GET['attributeIdToGet']));
+ }
+ catch(Exception $e){
+ print("UPS: ".$e->getMessage());
+ }
+ break;
+ default:
+ echo("Ungültige Aktion erwünscht!");
+ break;
+ }
+}
+
+$users =
+ dbQuery(
+ $dbConn,
+ "SELECT * FROM cwsvjudo.wkParticipo_Users;"
+ );
+
+$userAttributes =
+ dbQuery(
+ $dbConn,
+ "SELECT * FROM cwsvjudo.wkParticipo_userAttributes;"
+ );
+
+
+?>
+
+
+
+
+
+ Attribute
+
+ userAttributes` WHERE wkParticipo_Users.id = `wkParticipo_user<=>userAttributes`.userId AND `wkParticipo_user<=>userAttributes`.attributeId=:attributeId;",
+ array(":attributeId"=>array('value'=>$userAttribute['id'], 'data_type'=>PDO::PARAM_INT))
+ );
+ echo( "".$userAttribute['name']."
".array2htmlTableString($attributedUsers) );
+ }
+ ?>
+
+ User
+
+
+