aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorTobias Diekershoff <tobias.diekershoff@gmx.net>2011-06-15 07:02:38 +0200
committerTobias Diekershoff <tobias.diekershoff@gmx.net>2011-06-15 07:02:38 +0200
commitdbf6ee6a0578a0b4244852b74dac549a25e6f05d (patch)
treee2d33a9b7228d21fd8faa750e6b73eaa4f48e54c /view
parentd08b068031f01e1bcf57a46b9e7dfcb217b6fb30 (diff)
parentcee63c7a0d5362e255551d0a8c3dfa667322f8b1 (diff)
downloadvolse-hubzilla-dbf6ee6a0578a0b4244852b74dac549a25e6f05d.tar.gz
volse-hubzilla-dbf6ee6a0578a0b4244852b74dac549a25e6f05d.tar.bz2
volse-hubzilla-dbf6ee6a0578a0b4244852b74dac549a25e6f05d.zip
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'view')
-rw-r--r--view/event_form.tpl4
-rw-r--r--view/theme/duepuntozero/style.css24
-rw-r--r--view/theme/loozah/style.css28
3 files changed, 56 insertions, 0 deletions
diff --git a/view/event_form.tpl b/view/event_form.tpl
index 6401f16d0..5f3510bef 100644
--- a/view/event_form.tpl
+++ b/view/event_form.tpl
@@ -6,6 +6,10 @@ $e_desc
<form action="$post" method="post" >
+<input type="hidden" name="event_id" value="$eid" />
+<input type="hidden" name="cid" value="$cid" />
+<input type="hidden" name="uri" value="$uri" />
+
<div id="event-start-text">$s_text</div>
$s_dsel $s_tsel
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 9555a1e96..155641463 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -2228,10 +2228,29 @@ a.mail-list-link {
font-size: 20px;
}
+.vevent {
+ border: 1px solid #CCCCCC;
+}
+.vevent .event-description, .vevent .event-location {
+ margin-left: 10px;
+ margin-right: 10px;
+}
+.vevent .event-start {
+ margin-left: 10px;
+ margin-right: 10px;
+}
+
#new-event-link {
margin-bottom: 10px;
}
+.edit-event-link, .plink-event-link {
+ float: left;
+ margin-top: 4px;
+ margin-right: 4px;
+ margin-bottom: 15px;
+}
+
.event-description:before {
content: url('../../../images/calendar.png');
margin-right: 15px;
@@ -2247,6 +2266,10 @@ a.mail-list-link {
float: right;
}
+.event-list-date {
+ margin-bottom: 10px;
+}
+
.prevcal, .nextcal {
float: left;
margin-left: 32px;
@@ -2262,6 +2285,7 @@ a.mail-list-link {
font-family: Courier, monospace;
}
.today {
+ font-weight: bold;
color: #FF0000;
}
diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css
index a566acadc..d70968a84 100644
--- a/view/theme/loozah/style.css
+++ b/view/theme/loozah/style.css
@@ -2428,15 +2428,42 @@ a.mail-list-link {
font-size: 20px;
}
+
+.vevent {
+ border: 1px solid #CCCCCC;
+}
+.vevent .event-description, .vevent .event-location {
+ margin-left: 10px;
+ margin-right: 10px;
+}
+.vevent .event-start {
+ margin-left: 10px;
+ margin-right: 10px;
+}
+
+
#new-event-link {
margin-bottom: 10px;
}
+
+.edit-event-link, .plink-event-link {
+ float: left;
+ margin-top: 4px;
+ margin-right: 4px;
+ margin-bottom: 15px;
+}
+
+
.event-description:before {
content: url('../../../images/calendar.png');
margin-right: 15px;
}
+.event-list-date {
+ margin-bottom: 10px;
+}
+
.event-start, .event-end {
margin-left: 10px;
width: 330px;
@@ -2461,6 +2488,7 @@ a.mail-list-link {
font-family: Courier, monospace;
}
.today {
+ font-weight: bold;
color: #FF0000;
}