diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-06-30 21:51:33 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-06-30 21:51:33 -0400 |
| commit | 0fd8eeec23a0613db8ea6c5bb54b4658ddaa0e61 (patch) | |
| tree | b6684b05aee92729406a90f397ccd446f58863c7 /view/tpl | |
| parent | 7124c0aee5486aab74272c81ceb3e383b2e3a7f7 (diff) | |
| parent | 852b2659e9a71f0542e822aa20efc009e22ff66a (diff) | |
| download | volse-hubzilla-0fd8eeec23a0613db8ea6c5bb54b4658ddaa0e61.tar.gz volse-hubzilla-0fd8eeec23a0613db8ea6c5bb54b4658ddaa0e61.tar.bz2 volse-hubzilla-0fd8eeec23a0613db8ea6c5bb54b4658ddaa0e61.zip | |
Merge remote-tracking branch 'upstream/dev' into wiki
Diffstat (limited to 'view/tpl')
| -rw-r--r-- | view/tpl/dreport.tpl | 21 | ||||
| -rwxr-xr-x | view/tpl/event_head.tpl | 8 | ||||
| -rwxr-xr-x | view/tpl/jot-header.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/register.tpl | 3 |
4 files changed, 32 insertions, 2 deletions
diff --git a/view/tpl/dreport.tpl b/view/tpl/dreport.tpl new file mode 100644 index 000000000..7d5524a6a --- /dev/null +++ b/view/tpl/dreport.tpl @@ -0,0 +1,21 @@ +<div class="generic-content-wrapper"> + <div class="section-title-wrapper"> + {{if $table == 'item'}} + <a href="dreport/push/{{$mid}}"><button class="btn btn-default btn-xs pull-right">{{$push}}</button></a> + {{/if}} + <h2>{{$title}}</h2> + </div> + + <div> + <table> + {{if $entries}} + {{foreach $entries as $e}} + <tr> + <td width="40%">{{$e.name}}</td> + <td width="20%">{{$e.result}}</td> + <td width="20%">{{$e.time}}</td> + </tr> + {{/foreach}} + {{/if}} + </table> +</div> diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl index 762bdcbb8..4397c5c9d 100755 --- a/view/tpl/event_head.tpl +++ b/view/tpl/event_head.tpl @@ -34,7 +34,13 @@ $('#events-calendar').fullCalendar('option', 'height', 'auto'); } else { - $('#events-calendar').fullCalendar('option', 'height', ''); + if($('main').hasClass('fullscreen')) { + $('#calendar').fullCalendar('option', 'height', $(window).height() - $('.section-title-wrapper').outerHeight(true) - 2); // -2 is for border width (.generic-content-wrapper top and bottom) of .generic-content-wrapper + + } + else { + $('#calendar').fullCalendar('option', 'height', ''); + } } $('#title').text(view.title); } diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index f3dd8cafe..9953875ef 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -7,6 +7,7 @@ var pretext = '{{$pretext}}'; function initEditor(cb){ if (editor==false){ $("#profile-jot-text-loading").spin('small').show(); + {{$geotag}} if(plaintext == 'none') { $("#profile-jot-text-loading").spin(false).hide(); $("#profile-jot-text").css({ 'height': 200, 'color': '#000', 'line-height': 'inherit' }); @@ -362,7 +363,6 @@ function enableOnUser(){ $('#profile-nolocation-wrapper').attr('disabled', true); } - {{$geotag}} var initializeEmbedPhotoDialog = function () { $('.embed-photo-selected-photo').each(function (index) { diff --git a/view/tpl/register.tpl b/view/tpl/register.tpl index 4a827ca16..c84934626 100755 --- a/view/tpl/register.tpl +++ b/view/tpl/register.tpl @@ -54,5 +54,8 @@ <button class="btn btn-primary" type="submit" name="submit" id="newchannel-submit-button" value="{{$submit}}">{{$submit}}</button> <div id="register-submit-end" class="register-field-end"></div> </form> + <br /> + <div class="descriptive-text">{{$verify_note}}</div> + </div> </div> |