[pLog-svn] r1356 - in templates/trunk/pink_lilies: . imgs
jondaley at devel.plogworld.net
jondaley at devel.plogworld.net
Wed Mar 9 06:59:03 GMT 2005
Author: jondaley
Date: 2005-03-09 06:59:02 +0000 (Wed, 09 Mar 2005)
New Revision: 1356
Added:
templates/trunk/pink_lilies/imgs/
templates/trunk/pink_lilies/imgs/bullet.gif
templates/trunk/pink_lilies/imgs/comment.gif
templates/trunk/pink_lilies/imgs/date.gif
templates/trunk/pink_lilies/imgs/day.gif
templates/trunk/pink_lilies/imgs/day2.gif
templates/trunk/pink_lilies/imgs/download.gif
templates/trunk/pink_lilies/imgs/folderblue.gif
templates/trunk/pink_lilies/imgs/lilies.jpg
templates/trunk/pink_lilies/imgs/top.gif
Removed:
templates/trunk/pink_lilies/bullet.gif
templates/trunk/pink_lilies/comment.gif
templates/trunk/pink_lilies/date.gif
templates/trunk/pink_lilies/day.gif
templates/trunk/pink_lilies/day2.gif
templates/trunk/pink_lilies/download.gif
templates/trunk/pink_lilies/folderblue.gif
templates/trunk/pink_lilies/lilies.jpg
templates/trunk/pink_lilies/top.gif
Modified:
templates/trunk/pink_lilies/about.template
templates/trunk/pink_lilies/album.template
templates/trunk/pink_lilies/albums.template
templates/trunk/pink_lilies/commentarticle.template
templates/trunk/pink_lilies/commentform.template
templates/trunk/pink_lilies/error.template
templates/trunk/pink_lilies/footer.template
templates/trunk/pink_lilies/header.template
templates/trunk/pink_lilies/main.template
templates/trunk/pink_lilies/panel.template
templates/trunk/pink_lilies/post.template
templates/trunk/pink_lilies/postandcomments.template
templates/trunk/pink_lilies/posttrackbacks.template
templates/trunk/pink_lilies/resource.template
templates/trunk/pink_lilies/style.css
Log:
almost perfect.
Property changes on: templates/trunk/pink_lilies/about.template
___________________________________________________________________
Name: svn:executable
- *
Property changes on: templates/trunk/pink_lilies/album.template
___________________________________________________________________
Name: svn:executable
- *
Modified: templates/trunk/pink_lilies/albums.template
===================================================================
--- templates/trunk/pink_lilies/albums.template 2005-03-09 06:57:17 UTC (rev 1355)
+++ templates/trunk/pink_lilies/albums.template 2005-03-09 06:59:02 UTC (rev 1356)
@@ -15,7 +15,7 @@
</div>
<div class="feedback">
<a href="{$url->albumLink($album)}">
- <img src="{$url->getTemplateFile("folderblue.gif")}" width="10" height="11" style="border:0px;" />
+ <img src="{$url->getTemplateFile("imgs/folderblue.gif")}" width="10" height="11" style="border:0px;" />
{$locale->tr("view")} ({$album->getNumResources()})
</a>
</div>
Property changes on: templates/trunk/pink_lilies/albums.template
___________________________________________________________________
Name: svn:executable
- *
Deleted: templates/trunk/pink_lilies/bullet.gif
===================================================================
(Binary files differ)
Deleted: templates/trunk/pink_lilies/comment.gif
===================================================================
(Binary files differ)
Property changes on: templates/trunk/pink_lilies/commentarticle.template
___________________________________________________________________
Name: svn:executable
- *
Property changes on: templates/trunk/pink_lilies/commentform.template
___________________________________________________________________
Name: svn:executable
- *
Deleted: templates/trunk/pink_lilies/date.gif
===================================================================
(Binary files differ)
Deleted: templates/trunk/pink_lilies/day.gif
===================================================================
(Binary files differ)
Deleted: templates/trunk/pink_lilies/day2.gif
===================================================================
(Binary files differ)
Deleted: templates/trunk/pink_lilies/download.gif
===================================================================
(Binary files differ)
Property changes on: templates/trunk/pink_lilies/error.template
___________________________________________________________________
Name: svn:executable
- *
Deleted: templates/trunk/pink_lilies/folderblue.gif
===================================================================
(Binary files differ)
Property changes on: templates/trunk/pink_lilies/footer.template
___________________________________________________________________
Name: svn:executable
- *
Modified: templates/trunk/pink_lilies/header.template
===================================================================
--- templates/trunk/pink_lilies/header.template 2005-03-09 06:57:17 UTC (rev 1355)
+++ templates/trunk/pink_lilies/header.template 2005-03-09 06:59:02 UTC (rev 1356)
@@ -16,6 +16,9 @@
<body>
<div id="rap">
- <h1 id="header"><a href="{$url->blogLink()}" title="{$blog->getBlog()}">{$blog->getBlog()}</a></h1>
+ <div id="header">
+ <span id="description">{$blog->getAbout()}</span>
+ <span id="title"><a href="{$url->blogLink()}">{$blog->getBlog()}</a></span>
+ </div>
Property changes on: templates/trunk/pink_lilies/header.template
___________________________________________________________________
Name: svn:executable
- *
Copied: templates/trunk/pink_lilies/imgs/bullet.gif (from rev 1354, templates/trunk/pink_lilies/bullet.gif)
Copied: templates/trunk/pink_lilies/imgs/comment.gif (from rev 1354, templates/trunk/pink_lilies/comment.gif)
Copied: templates/trunk/pink_lilies/imgs/date.gif (from rev 1354, templates/trunk/pink_lilies/date.gif)
Copied: templates/trunk/pink_lilies/imgs/day.gif (from rev 1354, templates/trunk/pink_lilies/day.gif)
Copied: templates/trunk/pink_lilies/imgs/day2.gif (from rev 1354, templates/trunk/pink_lilies/day2.gif)
Copied: templates/trunk/pink_lilies/imgs/download.gif (from rev 1337, templates/trunk/pink_lilies/download.gif)
Copied: templates/trunk/pink_lilies/imgs/folderblue.gif (from rev 1354, templates/trunk/pink_lilies/folderblue.gif)
Copied: templates/trunk/pink_lilies/imgs/lilies.jpg (from rev 1355, templates/trunk/pink_lilies/lilies.jpg)
Copied: templates/trunk/pink_lilies/imgs/top.gif (from rev 1354, templates/trunk/pink_lilies/top.gif)
Deleted: templates/trunk/pink_lilies/lilies.jpg
===================================================================
(Binary files differ)
Modified: templates/trunk/pink_lilies/main.template
===================================================================
--- templates/trunk/pink_lilies/main.template 2005-03-09 06:57:17 UTC (rev 1355)
+++ templates/trunk/pink_lilies/main.template 2005-03-09 06:59:02 UTC (rev 1356)
@@ -9,4 +9,4 @@
</div>
{include file="$blogtemplate/panel.template"}
-{include file="$blogtemplate/footer.template"}
\ No newline at end of file
+{include file="$blogtemplate/footer.template"}
Property changes on: templates/trunk/pink_lilies/main.template
___________________________________________________________________
Name: svn:executable
- *
Modified: templates/trunk/pink_lilies/panel.template
===================================================================
--- templates/trunk/pink_lilies/panel.template 2005-03-09 06:57:17 UTC (rev 1355)
+++ templates/trunk/pink_lilies/panel.template 2005-03-09 06:59:02 UTC (rev 1356)
@@ -11,23 +11,23 @@
<li id="categories">
{$locale->tr("categories")}
<ul>
- {foreach from=$articlecategories item=articleCategory}
+ {foreach name="articlecategories" from=$articlecategories item=articleCategory}
<li><a href="{$url->categoryLink($articleCategory)}">{$articleCategory->getName()} [{$articleCategory->getNumArticles()}]</a></li>
{/foreach}
- </ul>
+ </ul>
</li>
<li id="archives">
{$locale->tr("archives")}
<ul>
- {foreach from=$archives item=archivelink}
- <li><a href="{$archivelink->getUrl()}">{$archivelink->getName()}</a></li>
- {/foreach}
+ {foreach name=archives from=$archives item=archivelink}
+ <li><a href="{$archivelink->getUrl()}">{$archivelink->getName()}</a></li>
+ {/foreach}
</ul>
- </li>
- <li id="calendar">
- {$calendar}
- </li>
+ </li>
+ <li id="calendar">
+ {$calendar}
+ </li>
<li id="meta">
Meta
@@ -43,17 +43,17 @@
<li id="style">
{$locale->tr("links")}
- <ul>
- {foreach from=$mylinkscategories item=linkcategory}
+ {foreach name=linkscategories from=$mylinkscategories item=linkcategory}
+ {if $smarty.foreach.linkscategories.first}<ul>{/if}
<li><b>{$linkcategory->getName()}</b>
- <ul>
- {foreach from=$linkcategory->getLinks() item=link}
- <li><a href="{$link->getUrl()}" title="{$link->getDescription()}">{$link->getName()}</a></li>
+ {foreach name=linkscategorieslinks from=$linkcategory->getLinks() item=link}
+ {if $smarty.foreach.linkscategorieslinks.first}<ul>{/if}
+ <li><a href="{$link->getUrl()}" title="{$link->getDescription()}">{$link->getName()}</a></li>
+ {if $smarty.foreach.linkscategorieslinks.last}</ul>{/if}
{/foreach}
- </ul>
</li>
+ {if $smarty.foreach.linkscategories.last}</ul>{/if}
{/foreach}
- </ul>
</li>
</ul>
</div>
Property changes on: templates/trunk/pink_lilies/panel.template
___________________________________________________________________
Name: svn:executable
- *
Property changes on: templates/trunk/pink_lilies/post.template
___________________________________________________________________
Name: svn:executable
- *
Modified: templates/trunk/pink_lilies/postandcomments.template
===================================================================
--- templates/trunk/pink_lilies/postandcomments.template 2005-03-09 06:57:17 UTC (rev 1355)
+++ templates/trunk/pink_lilies/postandcomments.template 2005-03-09 06:59:02 UTC (rev 1356)
@@ -28,14 +28,11 @@
</li>
{/foreach}
</ol>
-
{if $blogsettings->getValue("comments_enabled") && $post->getCommentsEnabled()==1}
- <br style="clear: both;" />
<h2>{$locale->tr("add_comment")}</h2>
{include file="$blogtemplate/commentform.template"}
{/if}
</div>
</div>
-
{include file="$blogtemplate/panel.template"}
{include file="$blogtemplate/footer.template"}
Property changes on: templates/trunk/pink_lilies/postandcomments.template
___________________________________________________________________
Name: svn:executable
- *
Property changes on: templates/trunk/pink_lilies/posttrackbacks.template
___________________________________________________________________
Name: svn:executable
- *
Modified: templates/trunk/pink_lilies/resource.template
===================================================================
--- templates/trunk/pink_lilies/resource.template 2005-03-09 06:57:17 UTC (rev 1355)
+++ templates/trunk/pink_lilies/resource.template 2005-03-09 06:59:02 UTC (rev 1356)
@@ -45,7 +45,7 @@
<br/>
<div class="feedback">
<a href="{$url->resourceDownloadLink($resource)}">
- <img src="{$url->getTemplateFile("download.gif")}" width="10" height="11" alt="Download" style="border:0px;" />
+ <img src="{$url->getTemplateFile("imgs/download.gif")}" width="10" height="11" alt="Download" style="border:0px;" />
{$locale->tr("download")} ({$metadata->getRoundedSize()})
</a>
</div>
Property changes on: templates/trunk/pink_lilies/resource.template
___________________________________________________________________
Name: svn:executable
- *
Modified: templates/trunk/pink_lilies/style.css
===================================================================
--- templates/trunk/pink_lilies/style.css 2005-03-09 06:57:17 UTC (rev 1355)
+++ templates/trunk/pink_lilies/style.css 2005-03-09 06:59:02 UTC (rev 1356)
@@ -3,8 +3,8 @@
/* Licensed under GPL (http://www.mysql.gr.jp/jpdoc/3.23/manual.ja_GPL_license.html#GPL_license */
/* Box Model Hack by Tantek Celik (http://www.tantek.com/CSS/Examples/boxmodelhack.html) */
body, html {
- margin: 0;
- padding:0;
+ margin: 0px;
+ padding:0px;
background: #74605A;
text-align: center;
}
@@ -25,65 +25,89 @@
a img { border: none; }
#rap {
- margin: 0 auto;
- padding: 0;
+ margin: 0px auto;
+ padding: 0px;
width: 720px;
- border-top: 1px solid #6E4646;
- border-right: 1px solid #6E4646;
- border-bottom-width: 0;
- border-left: 1px solid #6E4646;
+ border-width: 1px 1px 0px 1px;
+ border-style: solid;
+ border-color: #6E4646;
voice-family: "\"}\"";
voice-family: inherit;
width: 718px;
}
#header {
- background: url(top.gif) #A67879;
+ background: url(imgs/top.gif);
+ background-repeat: repeat-x;
text-align: right;
- padding: 8px 10px 2px 0;
- margin:0;
+ padding: 8px 10px 2px 0px;
+ margin:0px;
height: 56px;
voice-family: "\"}\"";
voice-family: inherit;
height: 46px;
- }
-
-#header a, #header a:visited, #header a:hover {
- text-decoration: none;
- font-size: .8em;
-
+}
+
+#rap #header #description {
+ position: relative;
+ text-align: left;
+ padding: 0px;
+ margin: 0px;
+ clear: none;
+ width: 65%;
+ color: #F9F5E7;
+ float: left;
+ font-size: 16px;
+ font-weight: bold;
+}
+
+#rap #header #title{
+ text-decoration: none;
+ position: relative;
+ text-align: right;
+ padding: 0px;
+ margin: 0px;
+ clear: none;
+ color: #F9F5E7;
+ float: right;
+ font-size: 32px;
+}
+
+
+#rap #header a:hover, #rap #header a:visited, #rap #header a:link{
color: #F9F5E7;
- }
+}
#content {
- background: url(lilies.jpg) repeat-y #F9F5E7;
+/* position: relative;*/
+ background: url(imgs/lilies.jpg) repeat-y #F9F5E7;
text-align: left;
width: 718px;
- padding: 0 0 0 160px;
+ padding: 0px 0px 0px 160px;
float: left;
color: #666;
- clear:both;
+ clear: both;
min-height: 800px;
voice-family: "\"}\"";
voice-family: inherit;
width: 558px;
- }
+}
-.post {
+#content .post {
width: 380px;
- margin: 0;
+ margin: 0px;
}
-h2 {
+#content h2 {
width: 380px;
font-size: .9em;
- margin: 0;
+ margin: 0px;
padding-top: 8px;
}
-h3 {
+#content h3 {
font-size: .9em;
- margin: 5px 0 0 0;
+ margin: 5px 0px 0px 0px;
}
/* MAIN COLUMN starts here */
@@ -93,68 +117,68 @@
#content p {
font-size: .7em;
width: 380px;
- margin: 0 0 1em 0;
+ margin: 0em 0em 1em 0em;
}
.storycontent ul {
list-style-type: none;
margin: 10px;
- padding: 0;
+ padding: 0px;
font-size: .7em;
}
.storycontent ul li {
- list-style-image: url(bullet.gif);
+ list-style-image: url(imgs/bullet.gif);
margin-left: 20px;
}
.storycontent ol {
margin-left: 10px;
margin-right: 20px;
- padding: 0;
+ padding: 0px;
font-size: .7em;
}
.meta {
font-size: .7em;
- margin: 5px 0 0 0;
+ margin: 5px 0px 0px 0px;
padding: 3px;
color: #3A3A3A;
- padding: 0 0 2px 16px;
- background: url(date.gif) no-repeat 2px 1px;
+ padding: 0px 0px 2px 16px;
+ background: url(imgs/date.gif) no-repeat 2px 1px;
}
.post-categories {
display: inline;
- margin: 0;
- padding: 0;
+ margin: 0px;
+ padding: 0px;
}
.post-categories li {
display: inline;
list-style-type: none;
- padding: 0;
- margin: 0;
+ padding: 0px;
+ margin: 0px;
}
.storycontent {
font-size: 1em;
text-align: justify;
width: 380px;
- margin: 10px 0 0 0;
+ margin: 10px 0px 0px 0px;
}
.feedback {
font-size: .7em;
- margin: 8px 0 0 0;
+ margin: 8px 0px 0px 0px;
color: #3A3A3A;
- padding: 0 20px 2px 16px;
- background: url(comment.gif) no-repeat 2px 1px;
+ padding: 0px 20px 2px 16px;
+ background: url(imgs/comment.gif) no-repeat 2px 1px;
}
#commentlist {
- margin: 0;
- padding: 0;
+ margin: 0px;
+ padding: 0px;
}
#commentlist li {
@@ -177,7 +201,7 @@
}
#commentlist cite {
- margin: 0;
+ margin: 0px;
font-size: .9em;
font-style: normal;
}
@@ -189,26 +213,28 @@
/* MENU starts here */
#menu {
+ position: relative;
width: 160px;
margin-left: -160px;
- float: left;
+ padding: 0px;
+ float: right;
text-align: left;
background: transparent;
- }
+}
#menu ul {
color: #612000;
font-weight: bold;
list-style-type: none;
margin: 0px;
- padding: 0 8px;
+ padding: 0px 4px;
}
#menu ul li {
font-family: georgia, times, serif;
font-weight: bold;
font-size: .9em;
- margin: 5px 0 5px 0;
+ margin: 5px 0px 5px 0px;
border-bottom:#AFA37C 1px dashed;
}
@@ -216,8 +242,8 @@
font-weight: normal;
line-height: 100%;
list-style-type: none;
- margin: 0 0 8px 0;
- padding: 0;
+ margin: 0px 0px 8px 0px;
+ padding: 0px;
text-align: left;
}
@@ -226,9 +252,9 @@
font-size: .75em;
font-weight: normal;
line-height: 1.2em;
- padding: 0;
- margin:0;
- border: 0;
+ padding: 0px;
+ margin: 0px;
+ border: 0px;
}
#menu input {
@@ -238,25 +264,25 @@
font-weight: normal;
}
-.calendar {
+#calendar {
background: #CCBE92;
empty-cells: show;
- font-size: 14px;
- width: 140px;
+ font-size: 11px;
+ width: 150px;
margin-bottom: 8px;
border: 1px solid #AFA37C;
}
-.calendar #next a, .calendar #next {
- padding: 0 5px 0 0;
+#calendar #next a, #calendar #next {
+ padding: 0px 5px 0px 0px;
text-align: right;
color: #333;
background: #CCBE92;
font-weight:normal;
}
-.calendar #prev a, .calendar #prev{
- padding: 0 0 0 5px;
+#calendar #prev a, #calendar #prev{
+ padding: 0px 0px 0px 5px;
text-align: left;
color: #333;
background: #CCBE92;
@@ -267,39 +293,36 @@
display: block;
text-decoration: none;
color: #6E2224;
- background: url(day2.gif);
}
-.calendar a:hover {
- background: url(day.gif);
+#calendar a:hover {
color: #FFF;
}
-.calendarHeader {
+#calendarHeader {
text-align: left;
padding-bottom: 2px;
padding-left: 2px;
}
-.calendar td {
+#calendar td, #calendar th {
color: #666;
- font-size: 10px;
+ font-size: 14px;
font-weight: normal;
- padding: 1px 1px;
+ padding: 0px;
text-align: center;
- background: url(day.gif);
}
-.calendar td.pad {
+#calendar td.pad {
background: #CCBE92;
}
-.calendarToday {
+#calendarToday {
background: #6E2224;
color: #FFF;
}
-.calendarHeader {
+#calendarHeader {
color: #6E2224;
font-style: normal;
text-transform: lowercase;
@@ -312,13 +335,13 @@
clear: both;
background: #A67879;
border-top: 1px solid #6E4646;
- border-bottom-width: 0;
+ border-bottom-width: 0px;
border-left: 1px solid #6E4646;
width: 720px;
- margin: 0 auto;
+ margin: 0px auto;
font-size: .7em;
color:#F9F5E7;
- padding: 3px 0;
+ padding: 3px 0px;
text-align: center;
voice-family: "\"}\"";
voice-family: inherit;
@@ -328,16 +351,16 @@
.credit a:hover { color:#F9F5E7; }
cite {
- margin: 0;
- padding: 0;
+ margin: 0px;
+ padding: 0px;
font-size: .9em;
font-style: normal;
}
#content blockquote p { border-top: 1px solid #E7768C;
- border-right-width: 0;
+ border-right-width: 0px;
border-bottom: 1px solid #E7768C;
- border-left-width: 0;
+ border-left-width: 0px;
font-size: .7em;
padding: 5px; margin: 8px 10px 8px 40px;
width: 350px;
@@ -346,7 +369,7 @@
width: 300px;
}
blockquote {
- padding: 0; margin: 0px; width:350px;
+ padding: 0px; margin: 0px; width:350px;
}
code, p code {
@@ -360,8 +383,8 @@
border-bottom: 1px dashed #E7768C;
}
-form { margin: 0;
- padding:0;
+form { margin: 0px;
+ padding:0px;
}
input {
@@ -385,7 +408,7 @@
select {
border: 1px solid #999;
background: #FFF;
- margin: 5px 0 0 0;
+ margin: 5px 0px 0px 0px;
padding-left: 3px;
color: #666;
- }
\ No newline at end of file
+ }
Property changes on: templates/trunk/pink_lilies/style.css
___________________________________________________________________
Name: svn:executable
- *
Deleted: templates/trunk/pink_lilies/top.gif
===================================================================
(Binary files differ)
More information about the pLog-svn
mailing list