[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: www/sites/kphotoalbum
From: Tobias Leupold <tobias.leupold () web ! de>
Date: 2015-05-29 15:29:50
Message-ID: E1YyMEI-0001bA-Vp () scm ! kde ! org
[Download RAW message or body]
SVN commit 1427895 by tleupold:
make use of the new item page system for the videos page. Also added some videos and \
removed the non-existing ones.
M +4 -4 README_new_release.txt
A add_item add_news_item#1427749
D add_news_item
AM documentation/videos/5vYg5Yia9kE.jpg
AM documentation/videos/7ChIaZ1j_bw.jpg
A documentation/videos/ATxcGFqbm0A.jpg \
documentation/videos/video3.jpg#1427478 AM \
documentation/videos/GDvbByjaU9U.jpg A \
documentation/videos/QLqGLQ251Xo.jpg documentation/videos/video1.jpg#1427478 AM \
documentation/videos/TxtD7BG61Ro.jpg AM \
documentation/videos/beEJ92bqDb4.jpg M +13 -63 documentation/videos/index.php \
A documentation/videos/items (directory)
A documentation/videos/items/0001
A documentation/videos/items/0002
A documentation/videos/items/0003
A documentation/videos/items/0004
A documentation/videos/items/0005
A documentation/videos/items/0006
A documentation/videos/items/0007
A documentation/videos/items/0008
A documentation/videos/knq2bw_rsIs.jpg \
documentation/videos/video2.jpg#1427478 D \
documentation/videos/video1.jpg D documentation/videos/video2.jpg
D documentation/videos/video3.jpg
D documentation/videos/video4.jpg
D documentation/videos/video5.jpg
D documentation/videos/video6.png
D documentation/videos/video7.png
D generate-news.py
M +2 -2 shared/footer.php
M +60 -35 styles/default.css
A update_newsfeed.py generate-news.py#1427749
--- trunk/www/sites/kphotoalbum/README_new_release.txt #1427894:1427895
@@ -1,6 +1,6 @@
When announcing a new release, do the following:
-Run the "add_news_item" script to create a new news item file. The current timestamp \
will be added +Run "add_item news" to create a new news item file. The current \
timestamp will be added automatically to the first line, along with some placeholder \
text.
Include all relevant information (cf. the other files). A list of all authors in \
alphabetical order @@ -11,8 +11,8 @@
You'll get the list already with <li> and </li>, so you just have to put it inside \
an <ul></ul>.
-Run generate-news.py to update the RSS feed.
+Run update_newsfeed.py to update the RSS feed.
-Update pages/download-source.inc.php.
+Update download/source/index.php.
-... and don't forget to add the new file to svn and commit it ;-)
+... and don't forget to add the new file(s) to svn and to commit it ;-)
--- trunk/www/sites/kphotoalbum/documentation/videos/index.php #1427894:1427895
@@ -1,68 +1,18 @@
-<?php require "{$_SERVER['DOCUMENT_ROOT']}/shared/header.php"; ?>
+<?php
+require "{$_SERVER['DOCUMENT_ROOT']}/shared/header.php";
+require "{$_SERVER['DOCUMENT_ROOT']}/shared/ItemPage.php";
-<h2>Videos</h2>
+echo "<h2>Videos</h2>\n\n<div id=\"videospage\">\n\n";
-<p>Below you will find a growing set of KPhotoAlbum videos that will tell you about \
KPhotoAlbum.<br /></p>
-<p><em class="orange">NOTICE: Some videos are currently not available, we
-are working on bringing them back online.</em></p>
-<p>
-<strong>Important:</strong> All videos have sound in them, and makes only little \
sense without, so ensure that sound is working for you.</p> +$itemPage = new \
ItemPage("{$_SERVER['DOCUMENT_ROOT']}/documentation/videos/items/");
-<table class="tabulka">
-<tr>
-<td><a href="http://youtu.be/QLqGLQ251Xo" title="See Video"><img src="video1.jpg" \
alt="Video screenshot" /></a></td>
-<td>In This tour I will explain the design goals behind KPhotoAlbum, and I will show \
you how simple it is to search for a given image, given you know who is on it, where \
it is taken, or some other property you've tagged the image with.<br \
/><br />
-<strong>Playing Time:</strong> 2:08<br />
-<strong>Size:</strong> 4 Mb<br />
-<strong>Format:</strong> YouTube
-</td>
-</tr>
+if (isset($_GET['item'])) {
+ $itemPage->showPage($_GET['item']);
+} else {
+ $itemPage->showPage();
+}
-<tr>
-<td><a href="http://youtu.be/knq2bw_rsIs" title="See Video"><img src="video2.jpg" \
alt="Video screenshot" /></a></td>
-<td>In this tour I'll show you how easy it is to annotate images.<br /><br />
-<strong>Playing Time:</strong> 3:22<br />
-<strong>Size:</strong> 7Mb<br />
-<strong>Format:</strong> YouTube</td>
-</tr>
+echo "</div>\n\n";
-<tr>
-<td><a href="http://youtu.be/ATxcGFqbm0A" title="See Video"><img src="video3.jpg" \
alt="Video screenshot" /></a></td>
-<td>Learn how you may add your own categories to be used when annotating images.<br \
/><br />
-<strong>Playing Time:</strong> 1:00<br />
-<strong>Size:</strong> 3.9Mb<br />
-<strong>Format:</strong> YouTube</td>
-</tr>
-
-<tr>
-<td><a href="data/videos/tour4.html" title="See Video"><img src="video4.jpg" \
alt="Video screenshot" /></a></td>
-<td>Learn how to use tokens to annotate your images while viewing them from the \
viewer.<br /><br />
-<strong>Playing Time:</strong> 2:18<br />
-<strong>Size:</strong> 20.0Mb<br />
-<strong>Format:</strong> missing</td>
-</tr>
-
-<tr>
-<td><a href="http://ktown.kde.org/akademy2005/unprocessed/KimDaBa-JesperPedersen-video.ogg" \
title="See Video"><img src="video5.jpg" alt="Video screenshot" \
/></a></td>
-<td>Presentation on KPhotoAlbum made at the KDE conference Akademy 2005.<br /><br />
-<strong>Playing Time:</strong> 50 minutes<br />
-<strong>Size:</strong> 62 Mb<br />
-<strong>Format:</strong> missing</td>
-</tr>
-
-<tr>
-<td><a href="http://youtu.be/7ChIaZ1j_bw" title="See Video"><img src="video6.png" \
alt="Video screenshot" /></a></td>
-<td>Demonstration of Age View.<br /><br />
-<strong>Playing Time:</strong> 1:34<br />
-<strong>Format:</strong> YouTube</td>
-</tr>
-
-<tr>
-<td><a href="http://youtu.be/GDvbByjaU9U" title="See Video"><img src="video7.png" \
alt="Video screenshot" /></a></td>
-<td>Demonstration of face detection and recognition.<br /><br />
-<strong>Playing Time:</strong> 2:36<br />
-<strong>Format:</strong> YouTube</td>
-</tr>
-</table>
-
-<?php require "{$_SERVER['DOCUMENT_ROOT']}/shared/footer.php"; ?>
\ No newline at end of file
+require "{$_SERVER['DOCUMENT_ROOT']}/shared/footer.php";
+?>
\ No newline at end of file
--- trunk/www/sites/kphotoalbum/shared/footer.php #1427894:1427895
@@ -6,8 +6,8 @@
<div id="paticka">
<p>
-Design & Code: <a href="mailto:jh@kolouch.netNO_SPAM_DELETE_THIS">Jaroslav \
Holaň</a>
- | Content: <a href="mailto:blackie@kde.org">Jesper Kjær Pedersen</a>
+Design & Code: <a href="mailto:jh@kolouch.netNO_SPAM_DELETE_THIS">Jaroslav \
Holaň</a> + | Content: <a href="mailto:blackie@kde.org">Jesper Kjær Pedersen</a>
| <a href="http://validator.w3.org/check?uri=https%3A%2F%2Fwww.kphotoalbum.org%2F" \
title="Validate XHTML">XHTML 1.1</a> | <a \
href="http://jigsaw.w3.org/css-validator/validator?uri=http%3A%2F%2Fkphotoalbum.org%2F" \
title="Validate CSS">CSS</a> </p>
--- trunk/www/sites/kphotoalbum/styles/default.css #1427894:1427895
@@ -1,47 +1,38 @@
-dl.table-display
-{
+* {
+ margin: 0;
+ padding: 0;
+}
+
+body {
+ text-align: center;
+ font-family: "trebuchet ms", tahoma, sans-serif;
+ background: url('../img/pozadi.jpg') top left repeat-x #4d4d4d;
+ padding-top: 20px;
+ font-size: 80%;
+}
+
+dl.table-display {
width: 41.1em;
margin: 2em 0;
padding: 0;
}
-.table-display dt
-{
+.table-display dt {
width: 12em;
float: left;
margin: 0 0 0 0;
padding: .5em;
-/*border-top: 1px solid #999;*/
font-weight: bold;
}
-/* commented backslash hack for mac-ie5 \*/
-dt { clear: both; }
-/* end hack */
-
-.table-display dd
-{
+.table-display dd {
float: left;
width: 26em;
margin: 0 0 0 0;
padding: .5em;
-/*border-top: 1px solid #999;*/
color:white;
}
-* {
-margin: 0;
-padding: 0;
-}
-
-body {
-text-align: center;
-font-family: "trebuchet ms", tahoma, sans-serif;
-background: url('../img/pozadi.jpg') top left repeat-x #4d4d4d;
-padding-top: 20px;
-font-size: 80%;
-}
-
#hlavicka, #telo, #paticka {
margin: 0 auto;
width: 770px;
@@ -49,19 +40,19 @@
#hlavicka {
position: relative;
-background: url('../img/hlavicka.jpg') top left no-repeat #555962;;
+ background: url('/img/hlavicka.jpg') top left no-repeat #555962;
height: 208px;
}
#telo {
-background: url('../img/telo.jpg') top left repeat-y #555962;;
+ background: url('/img/telo.jpg') top left repeat-y #555962;
text-align: left;
padding-bottom: 20px;
}
#paticka {
position: relative;
-background: url('../img/paticka.jpg') top left no-repeat #555962;;
+ background: url('/img/paticka.jpg') top left no-repeat #555962;
height: 63px;
}
@@ -78,7 +69,7 @@
}
.blue {
-color: #a1dfff !important;
+ color: #a1dfff;
}
#paticka p a {
@@ -126,15 +117,15 @@
#menu ul li ul {
margin-left: 15px;
-margin-bottom: 5px !important;
+ margin-bottom: 5px;
}
#menu ul li ul li {
-font-weight: normal !important;
+ font-weight: normal;
}
#menu ul li ul li a {
-font-weight: normal !important;
+ font-weight: normal;
}
#menu ul {
@@ -162,7 +153,7 @@
width: 522px;
padding-right: 20px;
margin-right: 21px;
-background: url('../img/obsah.jpg') top right no-repeat;
+ background: url('/img/obsah.jpg') top right no-repeat;
}
h1 {
@@ -171,6 +162,7 @@
letter-spacing: 2px;
margin-bottom: 20px;
}
+
h2 {
color: #a1dfff;
font-size: 160%;
@@ -370,13 +362,46 @@
margin-bottom: 2em;
}
-#newspage h3 {
+#newspage h3, #videospage h3 {
border-bottom: 1px solid white;
margin-bottom: 0em;
+ clear: both;
}
-#newspage .itempagedate {
+#newspage .itempagedate, #videospage .itempagedate {
font-weight: bold;
text-align: right;
+ margin-bottom: 1em;
+}
+
+#newspage .itempagedate {
margin-bottom: 2em;
}
+
+.itempagenavigation {
+ clear: both;
+}
+
+.itempagenavigation span {
+ font-weight: bold;
+ color: white;
+}
+
+#videospage .itempagedate {
+ margin-bottom: 0em;
+}
+
+#videospage .itempageitem img {
+ float: left;
+ margin-bottom: 2em;
+}
+
+#videospage .itempageitem p.itempagedate {
+ background: transparent;
+}
+
+#videospage .itempageitem p {
+ background: #434750;
+ margin-left: 210px;
+ padding: 0.5em;
+}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic