aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
Diffstat (limited to 'view')
-rw-r--r--view/css/mod_events.css14
-rw-r--r--view/js/main.js4
-rw-r--r--view/js/mod_events.js37
-rw-r--r--view/theme/redbasic/css/style.css28
-rw-r--r--view/theme/redbasic/php/style.php3
-rw-r--r--view/theme/redbasic/schema/dark.php12
-rwxr-xr-xview/tpl/atom_feed.tpl1
-rw-r--r--view/tpl/diaspora_vcard.tpl2
-rwxr-xr-xview/tpl/event_form.tpl106
-rwxr-xr-xview/tpl/photos_recent.tpl5
-rwxr-xr-xview/tpl/photosajax.tpl4
11 files changed, 201 insertions, 15 deletions
diff --git a/view/css/mod_events.css b/view/css/mod_events.css
index 657eff082..0aef13aa6 100644
--- a/view/css/mod_events.css
+++ b/view/css/mod_events.css
@@ -1,3 +1,17 @@
#event-desc-textarea, #event-location-textarea {
width: 400px;
+}
+
+#event-summary {
+ width: 400px;
+}
+
+.event-cats {
+ margin-top: 15px;
+ width: 400px;
+}
+
+.required {
+ color: #ff0000;
+ font-size: 1.2rem;
} \ No newline at end of file
diff --git a/view/js/main.js b/view/js/main.js
index b5b77d473..8c4fcdc13 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -285,7 +285,7 @@
scroll_next = true;
loadingPage = true;
- if($('.directory-end').length == 0)
+ if(($('.directory-end').length == 0) && ($('.photos-end').length == 0))
liveUpdate();
else
pageUpdate();
@@ -689,7 +689,7 @@ function updateConvItems(mode,data) {
bParam_page = 1;
}
- update_url = baseurl + '/directory/?f=&aj=1&page=' + bParam_page;
+ update_url = baseurl + '/' + page_query + '/?f=&aj=1&page=' + bParam_page + extra_args ;
$("#page-spinner").spin('small');
update_mode = 'append';
diff --git a/view/js/mod_events.js b/view/js/mod_events.js
new file mode 100644
index 000000000..0ce128fcc
--- /dev/null
+++ b/view/js/mod_events.js
@@ -0,0 +1,37 @@
+
+$(document).ready( function() { showHideFinishDate(); });
+
+function showHideFinishDate() {
+ if( $('#event-nofinish-checkbox').is(':checked'))
+ $('#event-finish-wrapper').hide();
+ else
+ $('#event-finish-wrapper').show();
+}
+
+
+
+ function eventGetStart() {
+ //reply = prompt("{{$expirewhen}}", $('#jot-expire').val());
+ $('#startModal').modal();
+ $('#start-modal-OKButton').on('click', function() {
+ reply=$('#start-date').val();
+ if(reply && reply.length) {
+ $('#start-text').val(reply);
+ $('#startModal').modal('hide');
+ }
+ })
+
+
+ }
+ function eventGetFinish() {
+ //reply = prompt("{{$expirewhen}}", $('#jot-expire').val());
+ $('#finishModal').modal();
+ $('#finish-modal-OKButton').on('click', function() {
+ reply=$('#finish-date').val();
+ if(reply && reply.length) {
+ $('#finish-text').val(reply);
+ $('#finishModal').modal('hide');
+ }
+ })
+
+ }
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 0f2949a49..4062c259c 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -660,11 +660,33 @@ aside li {
}
.photo-top-photo, .photo-album-photo {
- padding: 10px;
+ /* padding: 10px;
max-width: 300px;
border: 1px solid #888888;
+*/
+ position: absolute;
+ display: block;
+/* max-width: 100%;
+ max-height: 100%; */
+ left: 0;
+ right: 0;
+ top: 0;
+ bottom: 0;
+ margin: auto;
+}
+
+.photo-top-image-wrapper, .photo-album-image-wrapper {
+ width: 240px;
}
+.photo-top-photo-link, .photo-album-photo-link {
+ display: block;
+ width: 100%;
+ position: relative;
+ height: 0;
+ padding: 75% 0 0 0;
+ overflow: hidden;
+}
.photo-album-image-wrapper .caption {
background-color: $acpopup_bgcolour;
@@ -2162,6 +2184,10 @@ img.mail-list-sender-photo {
background-color: $abookself_bgcolour;
}
+.abook-pending-contact, .abook-permschange {
+ background: $abook_changebg;
+}
+
.online-now {
color: red;
cursor: pointer;
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index 4ffdcbef8..dbe7c306d 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -276,6 +276,8 @@ if(! $a->install) {
$dirpopup_txtcol="";
if (!$dirpopup_linkcol)
$dirpopup_linkcol="";
+ if (!$abook_changebg)
+ $abook_changebg="orange";
if($nav_min_opacity === false || $nav_min_opacity === '') {
$nav_float_min_opacity = 1.0;
@@ -400,6 +402,7 @@ $options = array (
'$admintable_hoverbgcol' => $admintable_hoverbgcol,
'$dirpopup_txtcol' => $dirpopup_txtcol,
'$dirpopup_linkcol' => $dirpopup_linkcol,
+'$abook_changebg' => $abook_changebg,
);
echo str_replace(array_keys($options), array_values($options), $x);
diff --git a/view/theme/redbasic/schema/dark.php b/view/theme/redbasic/schema/dark.php
index 69fcf403f..a4b43b31e 100644
--- a/view/theme/redbasic/schema/dark.php
+++ b/view/theme/redbasic/schema/dark.php
@@ -154,15 +154,15 @@
$abookself_bgcolour = "#251111";
if(! $infomess_bgcolour)
$infomess_bgcolour = "#333";
- if(! $advperm_bgcolour)
+ if(! $advperm_bgcolour)
$advperm_bgcolour = "#1E1E1E";
- if(! $advperm_bordercol)
+ if(! $advperm_bordercol)
$advperm_bordercol = "#222";
- if(! $advperm_gradientcol)
+ if(! $advperm_gradientcol)
$advperm_gradientcol = "#111";
- if(! $cal_bgcolour)
+ if(! $cal_bgcolour)
$cal_bgcolour = "#333";
- if(! $fancybox_bgcolour)
+ if(! $fancybox_bgcolour)
$fancybox_bgcolour = "#1E1E1E";
if (!$admintable_hoverbgcol)
$admintable_hoverbgcol="#222";
@@ -170,3 +170,5 @@
$dirpopup_txtcol="#111";
if (!$dirpopup_linkcol)
$dirpopup_linkcol="#000";
+ if (!$abook_changebg)
+ $abook_changebg="#402900";
diff --git a/view/tpl/atom_feed.tpl b/view/tpl/atom_feed.tpl
index 2c8024d47..9e5b5a5be 100755
--- a/view/tpl/atom_feed.tpl
+++ b/view/tpl/atom_feed.tpl
@@ -15,6 +15,7 @@
<title>{{$feed_title}}</title>
<generator uri="http://getzot.com" version="{{$version}}">{{$red}}</generator>
<link rel="license" href="http://creativecommons.org/licenses/by/3.0/" />
+ <link rel="alternate" type="text/html" href="{{$profile_page}}" />
{{if $hub}}
{{$hub}}
{{/if}}
diff --git a/view/tpl/diaspora_vcard.tpl b/view/tpl/diaspora_vcard.tpl
index 9d234a398..f9dac9306 100644
--- a/view/tpl/diaspora_vcard.tpl
+++ b/view/tpl/diaspora_vcard.tpl
@@ -2,7 +2,7 @@
<dl class='entity_nickname'>
<dt>Nickname</dt>
<dd>
- <a class="nickname url uid" href="{{$diaspora.podloc}}/" rel="me">{{$diaspora.nickname}}</a>
+ <a class="nickname url uid" href="{{$diaspora.podloc}}/" rel="me">{{$diaspora.fullname}}</a>
</dd>
</dl>
<dl class='entity_fn'>
diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl
index bfdf4d0b6..af10e6c73 100755
--- a/view/tpl/event_form.tpl
+++ b/view/tpl/event_form.tpl
@@ -1,7 +1,8 @@
<h3>{{$title}}</h3>
<p>
-{{$desc}}
+{{if ! $bootstrap}}
+{{$format_desc}} {{/if}}{{$desc}}
</p>
<form action="{{$post}}" method="post" >
@@ -10,18 +11,30 @@
<input type="hidden" name="xchan" value="{{$xchan}}" />
<input type="hidden" name="mid" value="{{$mid}}" />
+<div id="event-summary-text">{{$t_text}}</div>
+<input type="text" id="event-summary" name="summary" value="{{$t_orig}}" />
+
<div id="event-start-text">{{$s_text}}</div>
+{{if $bootstrap}}
+<i class="icon-calendar btn btn-default" onclick="eventGetStart(); return false;" /></i> <input type="text" name="start_text" id="start-text" value="{{$stext}}" />
+{{else}}
{{$s_dsel}} {{$s_tsel}}
+{{/if}}
<div class="clear"></div><br />
-<input type="checkbox" name="nofinish" value="1" id="event-nofinish-checkbox" {{$n_checked}} /> <div id="event-nofinish-text">{{$n_text}}</div>
+<input type="checkbox" name="nofinish" value="1" id="event-nofinish-checkbox" {{$n_checked}} onclick="showHideFinishDate(); return true;" /> <div id="event-nofinish-text">{{$n_text}}</div>
<div id="event-nofinish-break"></div>
-
+<div id="event-finish-wrapper">
<div id="event-finish-text">{{$f_text}}</div>
+{{if $bootstrap}}
+<i class="icon-calendar btn btn-default" onclick="eventGetFinish(); return false;" /></i> <input type="text" name="finish_text" id="finish-text" value="{{$ftext}}" />
+{{else}}
{{$f_dsel}} {{$f_tsel}}
+{{/if}}
+</div>
<div id="event-datetime-break"></div>
@@ -30,8 +43,14 @@
<div id="event-adjust-break"></div>
-<div id="event-summary-text">{{$t_text}}</div>
-<input type="text" id="event-summary" name="summary" value="{{$t_orig}}" />
+
+
+{{if $catsenabled}}
+<div id="event-category-wrap">
+ <input name="category" id="event-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" class="event-cats" style="display: block;" />
+</div>
+{{/if}}
+
<div id="event-desc-text">{{$d_text}}</div>
@@ -51,4 +70,81 @@
<input id="event-submit" type="submit" name="submit" value="{{$submit}}" />
</form>
+<!-- Modal for item expiry-->
+<div class="modal" id="startModal" tabindex="-1" role="dialog" aria-labelledby="expiryModalLabel" aria-hidden="true">
+ <div class="modal-dialog">
+ <div class="modal-content">
+ <div class="modal-header">
+ <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+ <h4 class="modal-title" id="startModalLabel">{{$s_text}}</h4>
+ </div>
+ <!-- <div class="modal-body"> -->
+ <div class="modal-body form-group" style="width:90%">
+ <div class="input-group input-group-sm date" id="datetimepickerstart">
+ <span class="input-group-addon"><!-- <span class="glyphicon glyphicon-calendar"></span> -->
+ <span class="icon-calendar"></span>
+ </span>
+ <input id="start-date" value='{{$stext}}' type='text' class="form-control" data-format="YYYY-MM-DD HH:mm" size="20"/>
+ </div>
+ </div>
+ <!-- </div> -->
+ <div class="modal-footer">
+ <button type="button" class="btn btn-default" data-dismiss="modal">{{$ModalCANCEL}}</button>
+ <button id="start-modal-OKButton" type="button" class="btn btn-primary">{{$ModalOK}}</button>
+ </div>
+ </div><!-- /.modal-content -->
+ </div><!-- /.modal-dialog -->
+</div><!-- /.modal -->
+<script type="text/javascript">
+ $(function() {
+ $('#datetimepickerstart').datetimepicker({
+ language: 'us',
+ icons: {
+ time: "icon-time",
+ date: "icon-calendar",
+ up: "icon-arrow-up",
+ down: "icon-arrow-down"
+ }
+ });
+ });
+</script>
+
+<!-- Modal for item expiry-->
+<div class="modal" id="finishModal" tabindex="-1" role="dialog" aria-labelledby="expiryModalLabel" aria-hidden="true">
+ <div class="modal-dialog">
+ <div class="modal-content">
+ <div class="modal-header">
+ <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+ <h4 class="modal-title" id="finishModalLabel">{{$s_text}}</h4>
+ </div>
+ <!-- <div class="modal-body"> -->
+ <div class="modal-body form-group" style="width:90%">
+ <div class="input-group input-group-sm date" id="datetimepickerfinish">
+ <span class="input-group-addon"><!-- <span class="glyphicon glyphicon-calendar"></span> -->
+ <span class="icon-calendar"></span>
+ </span>
+ <input id="finish-date" value='{{$ftext}}' type='text' class="form-control" data-format="YYYY-MM-DD HH:mm" size="20"/>
+ </div>
+ </div>
+ <!-- </div> -->
+ <div class="modal-footer">
+ <button type="button" class="btn btn-default" data-dismiss="modal">{{$ModalCANCEL}}</button>
+ <button id="finish-modal-OKButton" type="button" class="btn btn-primary">{{$ModalOK}}</button>
+ </div>
+ </div><!-- /.modal-content -->
+ </div><!-- /.modal-dialog -->
+</div><!-- /.modal -->
+<script type="text/javascript">
+ $(function() {
+ $('#datetimepickerfinish').datetimepicker({
+ language: 'us',
+ icons: {
+ time: "icon-time",
+ date: "icon-calendar",
+ up: "icon-arrow-up",
+ down: "icon-arrow-down"
+ }
+ });
+ });
+</script>
diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl
index 43a22a017..386979de5 100755
--- a/view/tpl/photos_recent.tpl
+++ b/view/tpl/photos_recent.tpl
@@ -3,9 +3,12 @@
<a id="photo-top-upload-link" href="{{$upload.1}}">{{$upload.0}}</a>
{{/if}}
-<div class="photos">
+<div id="photo-album-contents" class="photos">
{{foreach $photos as $photo}}
{{include file="photo_top.tpl"}}
{{/foreach}}
+<div id="page-end"></div>
</div>
<div class="photos-end"></div>
+<script>$(document).ready(function() { loadingPage = false;});</script>
+<div id="page-spinner"></div>
diff --git a/view/tpl/photosajax.tpl b/view/tpl/photosajax.tpl
new file mode 100755
index 000000000..a88682e8b
--- /dev/null
+++ b/view/tpl/photosajax.tpl
@@ -0,0 +1,4 @@
+<!-- -->
+{{foreach $photos as $photo}}
+ {{include file="photo_top.tpl"}}
+{{/foreach}}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 18:54:54 +0000