harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'event_edit'

Browse Source
This commit is contained in:
friendica 2015-02-08 20:23:36 -08:00
commit deab5d0dc4
5 changed files with 121 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
view/css/mod_events.css
View File

@ -33,3 +33,7 @@
#event-nofinish-break {
margin-bottom: 10px;
}
#event-desc-text, #event-location-text, .event-form-location-end {
margin-top: 15px;
}

2
view/js/mod_events.js
View File

@ -8,8 +8,6 @@ function showHideFinishDate() {
$('#event-finish-wrapper').show();
}
function eventGetStart() {
//reply = prompt("{{$expirewhen}}", $('#jot-expire').val());
$('#startModal').modal();

2
view/theme/redbasic/css/style.css
View File

@ -1221,7 +1221,7 @@ nav .acpopup {
}
#event-desc-text, #event-location-text {
margin-top: 10px;
margin-top: 15px;
margin-bottom: 5px;
}
#event-submit {

111
view/tpl/event_form.tpl
View File

@ -55,16 +55,119 @@
<div id="event-desc-text">{{$d_text}}</div>
<textarea id="event-desc-textarea" name="desc">{{$d_orig}}</textarea>
<textarea id="comment-edit-text-desc" class="comment-edit-text-full" name="desc" >{{$d_orig}}</textarea>
<div class="clear"></div>
<div id="comment-tools-desc" class="comment-tools" style="display: block;" >
<div id="comment-edit-bb-desc" class="btn-toolbar pull-left">
<div class='btn-group'>
<button class="btn btn-default btn-xs" title="{{$edbold}}" onclick="insertbbcomment('{{$comment}}','b', 'desc'); return false;">
<i class="icon-bold comment-icon"></i>
</button>
<button class="btn btn-default btn-xs" title="{{$editalic}}" onclick="insertbbcomment('{{$comment}}','i', 'desc'); return false;">
<i class="icon-italic comment-icon"></i>
</button>
<button class="btn btn-default btn-xs" title="{{$eduline}}" onclick="insertbbcomment('{{$comment}}','u', 'desc'); return false;">
<i class="icon-underline comment-icon"></i>
</button>
<button class="btn btn-default btn-xs" title="{{$edquote}}" onclick="insertbbcomment('{{$comment}}','quote','desc'); return false;">
<i class="icon-quote-left comment-icon"></i>
</button>
<button class="btn btn-default btn-xs" title="{{$edcode}}" onclick="insertbbcomment('{{$comment}}','code', 'desc'); return false;">
<i class="icon-terminal comment-icon"></i>
</button>
</div>
<div class='btn-group'>
<button class="btn btn-default btn-xs" title="{{$edimg}}" onclick="insertbbcomment('{{$comment}}','img', 'desc'); return false;">
<i class="icon-camera comment-icon"></i>
</button>
<button class="btn btn-default btn-xs" title="{{$edurl}}" onclick="insertbbcomment('{{$comment}}','url', 'desc'); return false;">
<i class="icon-link comment-icon"></i>
</button>
<button class="btn btn-default btn-xs" title="{{$edvideo}}" onclick="insertbbcomment('{{$comment}}','video', 'desc'); return false;">
<i class="icon-facetime-video comment-icon"></i>
</button>
</div>
</div>
<!-- <div class="btn-group pull-right" id="comment-edit-submit-wrapper-desc">
{{if $preview}}
<button id="comment-edit-submit-desc" class="btn btn-default btn-xs" onclick="preview_comment(desc); return false;" title="{{$preview}}">
<i class="icon-eye-open comment-icon" ></i>
</button>
{{/if}}
-->
</div>
<div class="clear"></div>
<div id="event-location-text">{{$l_text}}</div>
<textarea id="event-location-textarea" name="location">{{$l_orig}}</textarea>
<br />
<input type="checkbox" name="share" value="1" id="event-share-checkbox" {{$sh_checked}} /> <div id="event-share-text">{{$sh_text}}</div>
<textarea id="comment-edit-text-loc" class="comment-edit-text-full" name="location">{{$l_orig}}</textarea>
<div class="clear"></div>
<div id="comment-tools-loc" class="comment-tools" style="display: block;" >
<div id="comment-edit-bb-loc" class="btn-toolbar pull-left">
<div class='btn-group'>
<button class="btn btn-default btn-xs" title="{{$edbold}}" onclick="insertbbcomment('{{$comment}}','b', 'loc'); return false;">
<i class="icon-bold comment-icon"></i>
</button>
<button class="btn btn-default btn-xs" title="{{$editalic}}" onclick="insertbbcomment('{{$comment}}','i', 'loc'); return false;">
<i class="icon-italic comment-icon"></i>
</button>
<button class="btn btn-default btn-xs" title="{{$eduline}}" onclick="insertbbcomment('{{$comment}}','u', 'loc'); return false;">
<i class="icon-underline comment-icon"></i>
</button>
<button class="btn btn-default btn-xs" title="{{$edquote}}" onclick="insertbbcomment('{{$comment}}','quote','loc'); return false;">
<i class="icon-quote-left comment-icon"></i>
</button>
<button class="btn btn-default btn-xs" title="{{$edcode}}" onclick="insertbbcomment('{{$comment}}','code', 'loc'); return false;">
<i class="icon-terminal comment-icon"></i>
</button>
</div>
<div class='btn-group'>
<button class="btn btn-default btn-xs" title="{{$edimg}}" onclick="insertbbcomment('{{$comment}}','img', 'loc'); return false;">
<i class="icon-camera comment-icon"></i>
</button>
<button class="btn btn-default btn-xs" title="{{$edurl}}" onclick="insertbbcomment('{{$comment}}','url', 'loc'); return false;">
<i class="icon-link comment-icon"></i>
</button>
<button class="btn btn-default btn-xs" title="{{$edvideo}}" onclick="insertbbcomment('{{$comment}}','video', 'loc'); return false;">
<i class="icon-facetime-video comment-icon"></i>
</button>
</div>
</div>
<!-- <div class="btn-group pull-right" id="comment-edit-submit-wrapper-loc">
{{if $preview}}
<button id="comment-edit-submit-loc" class="btn btn-default btn-xs" onclick="preview_comment(loc); return false;" title="{{$preview}}">
<i class="icon-eye-open comment-icon" ></i>
</button>
{{/if}}
-->
</div>
<br />
<div class="clear event-form-location-end"></div>
<div class='field checkbox'>
<label class="mainlabel" for='id_share'>{{$sh_text}}</label>
<div><input type="checkbox" name='share' id='id_share' value="1" {{$sh_checked}} >
<label class="switchlabel" for='id_share'> <span class="onoffswitch-inner" data-on='' data-off='' ></span>
<span class="onoffswitch-switch"></span> </label></div><span class='field_help'></span>
</div>
<div id="event-share-break"></div>
<button id="event-permissions-button" class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;">{{$permissions}}</button>
{{$acl}}

4
view/tpl/event_head.tpl
View File

@ -118,9 +118,9 @@
$(document).ready(function() {
$('#event-share-checkbox').change(function() {
$('#id_share').change(function() {
if ($('#event-share-checkbox').is(':checked')) {
if ($('#id_share').is(':checked')) {
$('#event-permissions-button').show();
}
else {