marko/cwsvJudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Gallerien in der Wettkampfeinzelansicht, Makefile für den ftpUpload

Browse Source 
einer Videogallerie und Userattribute im Wettkampfplaner

Changes to be committed:

- Erweiterung der Wettkampfeinzelansicht um die (evtl. vorhandenen)
Galerien
 - modified:   phpLib/cwsvJudo/wkKalender.php
 - modified:   src/css/cwsvJudo-2018-mainNav.css
 - modified:   src/css/cwsvJudo-2018-wkKalender.css
- Makefile für das Hochladen einer Videogalerie
 - new file:   src/Makefiles/Makefile.ftpUpload
- Gehören mit zu den Gallerientemplates
 - new file:   src/galleryTemplates/indexHier.php
 - new file:   src/galleryTemplates/indexInArbeit.php
- Userattribute im Wettkampfplaner (war liegengeblieben)
 - new file:   wkParticipo/lib/wkParticipo-userAttribute.php
This commit is contained in:
marko
2018-11-06 10:21:53 +01:00
parent 00a50e2f0c
commit 2b7ab02db4
7 changed files with 246 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.ftpUpload Normal file
View File

@@ -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)

14
homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-mainNav.css
View File

@@ -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;

13
homepage/redesign2018/markdownExperiment/src/css/cwsvJudo-2018-wkKalender.css
View File

@@ -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%;
}

7
homepage/redesign2018/markdownExperiment/src/galleryTemplates/indexHier.php Normal file
View File

@@ -0,0 +1,7 @@
<?php
include_once("config.inc.php");
$wkName = empty($wkName) ? "<fehlender Wettkampfname>" : $wkName;
include_once( $_SERVER['DOCUMENT_ROOT']."/ressourcen/phpLib/videoGallery/videoGallery.tmpl.php" );
?>

20
homepage/redesign2018/markdownExperiment/src/galleryTemplates/indexInArbeit.php Normal file
View File

@@ -0,0 +1,20 @@
<?php
include_once("config.inc.php");
$basePath = "/users/cwsvjudo/www";
require_once($basePath."/config/phpcount.config.php");
require_once($basePath."/ressourcen/phpLib/phpcount/phpcount.php");
?>
<!DOCTYPE html>
<html>
<head>
<title>In Arbeit</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<?php PHPCount::AddHit($wkName." - Videoalbum (Vorschau)");?>
</head>
<body>
<p>Die Videos des Wettkampfes <?php echo($wkName);?> sind momentan noch in Vorbereitung. Einfach später noch mal probieren.</p>
<img style="width:100%;" src="/ressourcen/graphiken/misc/staffeleiM%e4nnlein.jpg" />
<p>Wer ganz ungeduldig ist, kann ja schon mal <a href="./indexHier.php">kiebitzen</a>.</p>
</body>
</html>