diff --git a/homepage/redesign2018/css/cwsvJudo-2018.css b/homepage/redesign2018/css/cwsvJudo-2018.css
index f5c8b8d..6c1c1dd 100644
--- a/homepage/redesign2018/css/cwsvJudo-2018.css
+++ b/homepage/redesign2018/css/cwsvJudo-2018.css
@@ -114,6 +114,10 @@ body{
width:100%;
}
+.valignMiddle{
+ vertical-align:middle;
+}
+
/* Bilder in voller Breite */
.bigPicture{
width: 100%;
diff --git a/homepage/redesign2018/markdownExperiment/Makefile b/homepage/redesign2018/markdownExperiment/Makefile
index 5c514de..036456a 100644
--- a/homepage/redesign2018/markdownExperiment/Makefile
+++ b/homepage/redesign2018/markdownExperiment/Makefile
@@ -45,10 +45,10 @@ ampTest: $(ampFiles)
build/css/cwsvJudo.css: $(cssFiles)
mkdir -p $(dir $@)
-# cat $(cssFiles) > $@
+ cat $^ > $@
# cat $(cssFiles) | cleancss -o $@
# cat $^ | ./node_modules/.bin/csso -o $@
- cat $^ | csso -o $@
+# cat $^ | csso -o $@
build/%.php: src/md/%.md build/yaml/%.yaml pandocTemplate/cwsvJudo.html5.pandocTemplate
mkdir -p build
diff --git a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php b/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php
index ba236c2..7437f24 100644
--- a/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php
+++ b/homepage/redesign2018/markdownExperiment/phpLib/cwsvJudo/wkKalender.php
@@ -250,6 +250,8 @@ function nicerAkList($akArray){
$ret = join(' und ', $both);
return $ret;
}
+
+
/// Wettkampfdaten als json-formatierte strukturierte Event-Daten
function wkArray2jsonSdEvent($wk){
return
@@ -303,6 +305,23 @@ function wkTableHtml(){
"".
"".
"
".$wk['Veranstaltung']."
".
+ wkBoxMediaGalleryHtml($wkGals);
+/*
+ if( !empty($wkGals) ){
+ foreach($wkGals as $wkGal){
+ // Für den Fall einer ampSeite müssen die imgTags angepasst werden
+ if( strpos( $_SERVER['ORIG_PATH_TRANSLATED'], "pages/amp" ) !== false ){
+ $siteData['mainContent'] .=
+ "
".( !empty($wkGal['teaserBildUrl'])?(""):"").("".$wkGal['typ']."galerie
")."";
+ }
+ else{
+ $siteData['mainContent'] .=
+ "
".( !empty($wkGal['teaserBildUrl'])?("![](\"".$wkGal['teaserBildUrl']."\")
"):"").("".$wkGal['typ']."galerie
")."";
+ }
+ }
+ }
+*/
+ $siteData['mainContent'] .=
"
Veranstaltungsdaten
".
"
".
"".
@@ -476,4 +480,41 @@ $wkInfoBoxHtml = "";
return $wkInfoBoxHtml;
}
+
+function wkBoxMediaGalleryHtml($wkGals){
+if(empty($wkGals)) return "";
+$retHtml = "";
+
+
+$retHtml .= "
";
+
+ $retHtml .= "";
+}
+
+$retHtml .= "
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
+
+
+
![](\"http://cwsvjudo.bplaced.net/ressourcen/graphiken/icons/filmrolle-grau.svg\")
")." ";
- }
- }
- }
$siteData['mainContent'] .=
"