diff options
Diffstat (limited to 'view/tpl')
65 files changed, 304 insertions, 714 deletions
diff --git a/view/tpl/activity_filter_widget.tpl b/view/tpl/activity_filter_widget.tpl new file mode 100644 index 000000000..1eb11c10f --- /dev/null +++ b/view/tpl/activity_filter_widget.tpl @@ -0,0 +1,25 @@ +<div class="widget"> + <h3 class="d-flex justify-content-between align-items-center"> + {{$title}} + {{if $reset}} + <a href="{{$reset.url}}" class="text-muted" title="{{$reset.title}}"> + <i class="fa fa-fw fa-{{$reset.icon}}"></i> + </a> + {{/if}} + </h3> + {{$content}} + {{if $name}} + <div class="notifications-textinput"> + <form method="get" action="{{$name.url}}" role="search"> + <div class="text-muted notifications-textinput-filter"><i class="fa fa-fw fa-filter"></i></div> + <input id="cid" type="hidden" value="" name="cid" /> + <input id="cid-filter" class="form-control form-control-sm{{if $name.sel}} {{$name.sel}}{{/if}}" type="text" value="" placeholder="{{$name.label}}" name="name" title="" /> + </form> + </div> + <script> + $("#cid-filter").name_autocomplete(baseurl + '/acl', 'a', true, function(data) { + $("#cid").val(data.id); + }); + </script> + {{/if}} +</div> diff --git a/view/tpl/admin_hubloc.tpl b/view/tpl/admin_hubloc.tpl deleted file mode 100755 index 1bd1f0122..000000000 --- a/view/tpl/admin_hubloc.tpl +++ /dev/null @@ -1,27 +0,0 @@ -<div class="generic-content-wrapper-styled" id='adminpage'> - <h1>{{$title}} - {{$page}}</h1> - - <table id='server'> - <thead> - <tr> - {{foreach $th_hubloc as $th}}<th>{{$th}}</th>{{/foreach}} - </tr> - </thead> - <tbody> - - {{foreach $hubloc as $hub}}<tr> - <td>{{$hub.hubloc_id}}</td><td>{{$hub.hubloc_addr}}</td><td>{{$hub.hubloc_host}}</td><td>{{$hub.hubloc_status}}</td> - <td> - <form action="{{$baseurl}}/admin/hubloc" method="post"> - <input type="hidden" name="hublocid" value="{{$hub.hubloc_id}}"> - <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> - <input type='hidden' name='url' value='{{$hub.hubloc_host}}'> - <input type="submit" name="check" value="check" > - <input type="submit" name="repair" value="repair" ></td> - </form> - </tr>{{/foreach}} - </tbody> - </table> - - -</div> diff --git a/view/tpl/admin_plugins.tpl b/view/tpl/admin_plugins.tpl index adc0db434..d8e1a6711 100755 --- a/view/tpl/admin_plugins.tpl +++ b/view/tpl/admin_plugins.tpl @@ -77,7 +77,7 @@ var repoName = $('#id_repoName').val(); $('#chat-rotator').show(); $.post( - "/admin/plugins/addrepo", {repoURL: repoURL, repoName: repoName}, + "/admin/addons/addrepo", {repoURL: repoURL, repoName: repoName}, function(response) { $('#chat-rotator').hide(); if (response.success) { @@ -104,7 +104,7 @@ var repoURL = $('#id_repoURL').val(); var repoName = $('#id_repoName').val(); $.post( - "/admin/plugins/installrepo", {repoURL: repoURL, repoName: repoName}, + "/admin/addons/installrepo", {repoURL: repoURL, repoName: repoName}, function(response) { if (response.success) { $('#generic-modal-title-{{$newRepoModalID}}').html('Addon repo installed'); @@ -137,7 +137,7 @@ function updateAddonRepo(repoName) { if(confirm('Are you sure you want to update the addon repo ' + repoName + '?')) { $.post( - "/admin/plugins/updaterepo", {repoName: repoName}, + "/admin/addons/updaterepo", {repoName: repoName}, function(response) { if (response.success) { window.console.log('Addon repo '+repoName+' successfully updated :' + response['message']); @@ -170,7 +170,7 @@ // TODO: Unlink the addons if(confirm('Are you sure you want to remove the addon repo ' + repoName + '?')) { $.post( - "/admin/plugins/removerepo", {repoName: repoName}, + "/admin/addons/removerepo", {repoName: repoName}, function(response) { if (response.success) { window.console.log('Addon repo '+repoName+' successfully removed :' + response['message']); diff --git a/view/tpl/admin_security.tpl b/view/tpl/admin_security.tpl index 409e9fc7d..493707a7a 100755 --- a/view/tpl/admin_security.tpl +++ b/view/tpl/admin_security.tpl @@ -7,6 +7,8 @@ {{include file="field_checkbox.tpl" field=$block_public}} + {{include file="field_checkbox.tpl" field=$cloud_noroot}} + {{include file="field_checkbox.tpl" field=$cloud_disksize}} {{include file="field_checkbox.tpl" field=$transport_security}} {{include file="field_checkbox.tpl" field=$content_security}} {{include file="field_checkbox.tpl" field=$embed_sslonly}} diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index 7e99b2c86..3288c2988 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -68,6 +68,7 @@ <h3>{{$registration}}</h3> {{include file="field_input.tpl" field=$register_text}} + {{include file="field_select_grouped.tpl" field=$role}} {{include file="field_select.tpl" field=$register_policy}} {{include file="field_checkbox.tpl" field=$invite_only}} {{include file="field_input.tpl" field=$minimum_age}} @@ -85,6 +86,8 @@ {{include file="field_checkbox.tpl" field=$disable_discover_tab}} {{include file="field_checkbox.tpl" field=$site_firehose}} {{include file="field_checkbox.tpl" field=$open_pubstream}} + {{include file="field_textarea.tpl" field=$incl}} + {{include file="field_textarea.tpl" field=$excl}} <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div> diff --git a/view/tpl/api_config_xml.tpl b/view/tpl/api_config_xml.tpl deleted file mode 100755 index 8c0766c73..000000000 --- a/view/tpl/api_config_xml.tpl +++ /dev/null @@ -1,66 +0,0 @@ -<config> - <site> - <name>{{$config.site.name}}</name> - <server>{{$config.site.server}}</server> - <theme>default</theme> - <path></path> - <logo>{{$config.site.logo}}</logo> - - <fancy>true</fancy> - <language>en</language> - <email>{{$config.site.email}}</email> - <broughtby></broughtby> - <broughtbyurl></broughtbyurl> - <timezone>UTC</timezone> - <closed>{{$config.site.closed}}</closed> - - <inviteonly>false</inviteonly> - <private>{{$config.site.private}}</private> - <textlimit>{{$config.site.textlimit}}</textlimit> - <ssl>{{$config.site.ssl}}</ssl> - <sslserver>{{$config.site.sslserver}}</sslserver> - <shorturllength>30</shorturllength> - -</site> - <license> - <type>cc</type> - <owner></owner> - <url>http://creativecommons.org/licenses/by/3.0/</url> - <title>Creative Commons Attribution 3.0</title> - <image>http://i.creativecommons.org/l/by/3.0/80x15.png</image> - -</license> - <nickname> - <featured></featured> -</nickname> - <profile> - <biolimit></biolimit> -</profile> - <group> - <desclimit></desclimit> -</group> - <notice> - - <contentlimit></contentlimit> -</notice> - <throttle> - <enabled>false</enabled> - <count>20</count> - <timespan>600</timespan> -</throttle> - <xmpp> - - <enabled>false</enabled> - <server>INVALID SERVER</server> - <port>5222</port> - <user>update</user> -</xmpp> - <integration> - <source>StatusNet</source> - -</integration> - <attachments> - <uploads>false</uploads> - <file_quota>0</file_quota> -</attachments> -</config> diff --git a/view/tpl/api_friends_xml.tpl b/view/tpl/api_friends_xml.tpl deleted file mode 100755 index f2a7234d1..000000000 --- a/view/tpl/api_friends_xml.tpl +++ /dev/null @@ -1,5 +0,0 @@ -<users type="array"> - {{foreach $users as $user}} - {{include file="api_user_xml.tpl"}} - {{/foreach}} -</users> diff --git a/view/tpl/api_ratelimit_xml.tpl b/view/tpl/api_ratelimit_xml.tpl deleted file mode 100755 index e4b470a25..000000000 --- a/view/tpl/api_ratelimit_xml.tpl +++ /dev/null @@ -1,6 +0,0 @@ -<hash> - <remaining-hits type="integer">{{$hash.remaining_hits}}</remaining-hits> - <hourly-limit type="integer">{{$hash.hourly_limit}}</hourly-limit> - <reset-time type="datetime">{{$hash.reset_time}}</reset-time> - <reset_time_in_seconds type="integer">{{$hash.resettime_in_seconds}}</reset_time_in_seconds> -</hash> diff --git a/view/tpl/api_status_xml.tpl b/view/tpl/api_status_xml.tpl deleted file mode 100755 index cbb736e22..000000000 --- a/view/tpl/api_status_xml.tpl +++ /dev/null @@ -1,46 +0,0 @@ -<status>{{if $status}} - <created_at>{{$status.created_at}}</created_at> - <id>{{$status.id}}</id> - <text>{{$status.text}}</text> - <source>{{$status.source}}</source> - <truncated>{{$status.truncated}}</truncated> - <in_reply_to_status_id>{{$status.in_reply_to_status_id}}</in_reply_to_status_id> - <in_reply_to_user_id>{{$status.in_reply_to_user_id}}</in_reply_to_user_id> - <favorited>{{$status.favorited}}</favorited> - <in_reply_to_screen_name>{{$status.in_reply_to_screen_name}}</in_reply_to_screen_name> - <geo>{{$status.geo}}</geo> - <coordinates>{{$status.coordinates}}</coordinates> - <place>{{$status.place}}</place> - <contributors>{{$status.contributors}}</contributors> - <user> - <id>{{$status.user.id}}</id> - <name>{{$status.user.name}}</name> - <screen_name>{{$status.user.screen_name}}</screen_name> - <location>{{$status.user.location}}</location> - <description>{{$status.user.description}}</description> - <profile_image_url>{{$status.user.profile_image_url}}</profile_image_url> - <url>{{$status.user.url}}</url> - <protected>{{$status.user.protected}}</protected> - <followers_count>{{$status.user.followers}}</followers_count> - <profile_background_color>{{$status.user.profile_background_color}}</profile_background_color> - <profile_text_color>{{$status.user.profile_text_color}}</profile_text_color> - <profile_link_color>{{$status.user.profile_link_color}}</profile_link_color> - <profile_sidebar_fill_color>{{$status.user.profile_sidebar_fill_color}}</profile_sidebar_fill_color> - <profile_sidebar_border_color>{{$status.user.profile_sidebar_border_color}}</profile_sidebar_border_color> - <friends_count>{{$status.user.friends_count}}</friends_count> - <created_at>{{$status.user.created_at}}</created_at> - <favourites_count>{{$status.user.favourites_count}}</favourites_count> - <utc_offset>{{$status.user.utc_offset}}</utc_offset> - <time_zone>{{$status.user.time_zone}}</time_zone> - <profile_background_image_url>{{$status.user.profile_background_image_url}}</profile_background_image_url> - <profile_background_tile>{{$status.user.profile_background_tile}}</profile_background_tile> - <profile_use_background_image>{{$status.user.profile_use_background_image}}</profile_use_background_image> - <notifications></notifications> - <geo_enabled>{{$status.user.geo_enabled}}</geo_enabled> - <verified>{{$status.user.verified}}</verified> - <following></following> - <statuses_count>{{$status.user.statuses_count}}</statuses_count> - <lang>{{$status.user.lang}}</lang> - <contributors_enabled>{{$status.user.contributors_enabled}}</contributors_enabled> - </user> -{{/if}}</status> diff --git a/view/tpl/api_test_xml.tpl b/view/tpl/api_test_xml.tpl deleted file mode 100755 index 80a541c39..000000000 --- a/view/tpl/api_test_xml.tpl +++ /dev/null @@ -1 +0,0 @@ -<ok>{{$ok}}</ok> diff --git a/view/tpl/api_timeline_atom.tpl b/view/tpl/api_timeline_atom.tpl deleted file mode 100755 index e8bfb689e..000000000 --- a/view/tpl/api_timeline_atom.tpl +++ /dev/null @@ -1,90 +0,0 @@ -<feed xml:lang="en-US" xmlns="http://www.w3.org/2005/Atom" xmlns:thr="http://purl.org/syndication/thread/1.0" xmlns:georss="http://www.georss.org/georss" xmlns:activity="http://activitystrea.ms/spec/1.0/" xmlns:media="http://purl.org/syndication/atommedia" xmlns:poco="http://portablecontacts.net/spec/1.0" xmlns:ostatus="http://ostatus.org/schema/1.0" xmlns:statusnet="http://status.net/schema/api/1/"> - <generator uri="http://status.net" version="0.9.7">StatusNet</generator> - <id>{{$rss.self}}</id> - <title>Friendika</title> - <subtitle>Friendika API feed</subtitle> - <logo>{{$rss.logo}}</logo> - <updated>{{$rss.atom_updated}}</updated> - <link type="text/html" rel="alternate" href="{{$rss.alternate}}"/> - <link type="application/atom+xml" rel="self" href="{{$rss.self}}"/> - - - <author> - <activity:obj_type>http://activitystrea.ms/schema/1.0/person</activity:obj_type> - <uri>{{$user.url}}</uri> - <name>{{$user.name}}</name> - <link rel="alternate" type="text/html" href="{{$user.url}}"/> - <link rel="avatar" type="image/jpeg" media:width="106" media:height="106" href="{{$user.profile_image_url}}"/> - <link rel="avatar" type="image/jpeg" media:width="96" media:height="96" href="{{$user.profile_image_url}}"/> - <link rel="avatar" type="image/jpeg" media:width="48" media:height="48" href="{{$user.profile_image_url}}"/> - <link rel="avatar" type="image/jpeg" media:width="24" media:height="24" href="{{$user.profile_image_url}}"/> - <georss:point></georss:point> - <poco:preferredUsername>{{$user.screen_name}}</poco:preferredUsername> - <poco:displayName>{{$user.name}}</poco:displayName> - <poco:urls> - <poco:type>homepage</poco:type> - <poco:value>{{$user.url}}</poco:value> - <poco:primary>true</poco:primary> - </poco:urls> - <statusnet:profile_info local_id="{{$user.id}}"></statusnet:profile_info> - </author> - - <!--Deprecation warning: activity:subject is present only for backward compatibility. It will be removed in the next version of StatusNet.--> - <activity:subject> - <activity:obj_type>http://activitystrea.ms/schema/1.0/person</activity:obj_type> - <id>{{$user.contact_url}}</id> - <title>{{$user.name}}</title> - <link rel="alternate" type="text/html" href="{{$user.url}}"/> - <link rel="avatar" type="image/jpeg" media:width="106" media:height="106" href="{{$user.profile_image_url}}"/> - <link rel="avatar" type="image/jpeg" media:width="96" media:height="96" href="{{$user.profile_image_url}}"/> - <link rel="avatar" type="image/jpeg" media:width="48" media:height="48" href="{{$user.profile_image_url}}"/> - <link rel="avatar" type="image/jpeg" media:width="24" media:height="24" href="{{$user.profile_image_url}}"/> - <poco:preferredUsername>{{$user.screen_name}}</poco:preferredUsername> - <poco:displayName>{{$user.name}}</poco:displayName> - <poco:urls> - <poco:type>homepage</poco:type> - <poco:value>{{$user.url}}</poco:value> - <poco:primary>true</poco:primary> - </poco:urls> - <statusnet:profile_info local_id="{{$user.id}}"></statusnet:profile_info> - </activity:subject> - - - {{foreach $statuses as $status}} - <entry> - <activity:obj_type>{{$status.objecttype}}</activity:obj_type> - <id>{{$status.message_id}}</id> - <title>{{$status.text}}</title> - <content type="html">{{$status.statusnet_html}}</content> - <link rel="alternate" type="text/html" href="{{$status.url}}"/> - <activity:verb>{{$status.verb}}</activity:verb> - <published>{{$status.published}}</published> - <updated>{{$status.updated}}</updated> - - <link rel="self" type="application/atom+xml" href="{{$status.self}}"/> - <link rel="edit" type="application/atom+xml" href="{{$status.edit}}"/> - <statusnet:notice_info local_id="{{$status.id}}" source="{{$status.source}}" > - </statusnet:notice_info> - - <author> - <activity:obj_type>http://activitystrea.ms/schema/1.0/person</activity:obj_type> - <uri>{{$status.user.url}}</uri> - <name>{{$status.user.name}}</name> - <link rel="alternate" type="text/html" href="{{$status.user.url}}"/> - <link rel="avatar" type="image/jpeg" media:width="48" media:height="48" href="{{$status.user.profile_image_url}}"/> - - <georss:point/> - <poco:preferredUsername>{{$status.user.screen_name}}</poco:preferredUsername> - <poco:displayName>{{$status.user.name}}</poco:displayName> - <poco:address/> - <poco:urls> - <poco:type>homepage</poco:type> - <poco:value>{{$status.user.url}}</poco:value> - <poco:primary>true</poco:primary> - </poco:urls> - </author> - <link rel="ostatus:conversation" type="text/html" href="{{$status.url}}"/> - - </entry> - {{/foreach}} -</feed> diff --git a/view/tpl/api_timeline_rss.tpl b/view/tpl/api_timeline_rss.tpl deleted file mode 100755 index 86c645e99..000000000 --- a/view/tpl/api_timeline_rss.tpl +++ /dev/null @@ -1,26 +0,0 @@ -<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0" xmlns:georss="http://www.georss.org/georss" xmlns:twitter="http://api.twitter.com"> - <channel> - <title>Friendika</title> - <link>{{$rss.alternate}}</link> - <atom:link type="application/rss+xml" rel="self" href="{{$rss.self}}"/> - <description>Friendika timeline</description> - <language>{{$rss.language}}</language> - <ttl>40</ttl> - <image> - <link>{{$user.link}}</link> - <title>{{$user.name}}'s items</title> - <url>{{$user.profile_image_url}}</url> - </image> - -{{foreach $statuses as $status}} - <item> - <title>{{$status.user.name}}: {{$status.text}}</title> - <description>{{$status.text}}</description> - <pubDate>{{$status.created_at}}</pubDate> - <guid>{{$status.url}}</guid> - <link>{{$status.url}}</link> - <twitter:source>{{$status.source}}</twitter:source> - </item> -{{/foreach}} - </channel> -</rss> diff --git a/view/tpl/api_timeline_xml.tpl b/view/tpl/api_timeline_xml.tpl deleted file mode 100755 index f14d73e9c..000000000 --- a/view/tpl/api_timeline_xml.tpl +++ /dev/null @@ -1,20 +0,0 @@ -<statuses type="array" xmlns:statusnet="http://status.net/schema/api/1/"> -{{foreach $statuses as $status}} <status> - <text>{{$status.text}}</text> - <truncated>{{$status.truncated}}</truncated> - <created_at>{{$status.created_at}}</created_at> - <in_reply_to_status_id>{{$status.in_reply_to_status_id}}</in_reply_to_status_id> - <source>{{$status.source}}</source> - <id>{{$status.id}}</id> - <in_reply_to_user_id>{{$status.in_reply_to_user_id}}</in_reply_to_user_id> - <in_reply_to_screen_name>{{$status.in_reply_to_screen_name}}</in_reply_to_screen_name> - <geo>{{$status.geo}}</geo> - <favorited>{{$status.favorited}}</favorited> -{{include file="api_user_xml.tpl" user=$status.user}} <statusnet:html>{{$status.statusnet_html}}</statusnet:html> - <statusnet:conversation_id>{{$status.statusnet_conversation_id}}</statusnet:conversation_id> - <url>{{$status.url}}</url> - <coordinates>{{$status.coordinates}}</coordinates> - <place>{{$status.place}}</place> - <contributors>{{$status.contributors}}</contributors> - </status> -{{/foreach}}</statuses> diff --git a/view/tpl/api_user_xml.tpl b/view/tpl/api_user_xml.tpl deleted file mode 100755 index 3b51992f6..000000000 --- a/view/tpl/api_user_xml.tpl +++ /dev/null @@ -1,46 +0,0 @@ - <user> - <id>{{$user.id}}</id> - <name>{{$user.name}}</name> - <screen_name>{{$user.screen_name}}</screen_name> - <location>{{$user.location}}</location> - <description>{{$user.description}}</description> - <profile_image_url>{{$user.profile_image_url}}</profile_image_url> - <url>{{$user.url}}</url> - <protected>{{$user.protected}}</protected> - <followers_count>{{$user.followers_count}}</followers_count> - <friends_count>{{$user.friends_count}}</friends_count> - <created_at>{{$user.created_at}}</created_at> - <favourites_count>{{$user.favourites_count}}</favourites_count> - <utc_offset>{{$user.utc_offset}}</utc_offset> - <time_zone>{{$user.time_zone}}</time_zone> - <statuses_count>{{$user.statuses_count}}</statuses_count> - <following>{{$user.following}}</following> - <profile_background_color>{{$user.profile_background_color}}</profile_background_color> - <profile_text_color>{{$user.profile_text_color}}</profile_text_color> - <profile_link_color>{{$user.profile_link_color}}</profile_link_color> - <profile_sidebar_fill_color>{{$user.profile_sidebar_fill_color}}</profile_sidebar_fill_color> - <profile_sidebar_border_color>{{$user.profile_sidebar_border_color}}</profile_sidebar_border_color> - <profile_background_image_url>{{$user.profile_background_image_url}}</profile_background_image_url> - <profile_background_tile>{{$user.profile_background_tile}}</profile_background_tile> - <profile_use_background_image>{{$user.profile_use_background_image}}</profile_use_background_image> - <notifications>{{$user.notifications}}</notifications> - <geo_enabled>{{$user.geo_enabled}}</geo_enabled> - <verified>{{$user.verified}}</verified> - <lang>{{$user.lang}}</lang> - <contributors_enabled>{{$user.contributors_enabled}}</contributors_enabled> - <status>{{if $user.status}} - <created_at>{{$user.status.created_at}}</created_at> - <id>{{$user.status.id}}</id> - <text>{{$user.status.text}}</text> - <source>{{$user.status.source}}</source> - <truncated>{{$user.status.truncated}}</truncated> - <in_reply_to_status_id>{{$user.status.in_reply_to_status_id}}</in_reply_to_status_id> - <in_reply_to_user_id>{{$user.status.in_reply_to_user_id}}</in_reply_to_user_id> - <favorited>{{$user.status.favorited}}</favorited> - <in_reply_to_screen_name>{{$user.status.in_reply_to_screen_name}}</in_reply_to_screen_name> - <geo>{{$user.status.geo}}</geo> - <coordinates>{{$user.status.coordinates}}</coordinates> - <place>{{$user.status.place}}</place> - <contributors>{{$user.status.contributors}}</contributors> - {{/if}}</status> - </user> diff --git a/view/tpl/appstore.tpl b/view/tpl/appstore.tpl new file mode 100644 index 000000000..47f144752 --- /dev/null +++ b/view/tpl/appstore.tpl @@ -0,0 +1,8 @@ +<div class="widget"> +<h3>{{$title}}</h3> +<ul class="nav nav-pills flex-column"> +{{foreach $options as $x}} + <li class="nav-item"><a href="{{$x.0}}" class="nav-link{{if $x.2}} active{{/if}}">{{$x.1}}</a></li> +{{/foreach}} +</ul> +</div> diff --git a/view/tpl/birthdays_reminder.tpl b/view/tpl/birthdays_reminder.tpl deleted file mode 100755 index d0500364a..000000000 --- a/view/tpl/birthdays_reminder.tpl +++ /dev/null @@ -1,10 +0,0 @@ -{{if $count}} -<div id="birthday-notice" class="birthday-notice fakelink {{$classtoday}}" onclick="openClose('birthday-wrapper');">{{$event_reminders}} ({{$count}})</div> -<div id="birthday-wrapper" style="display: none;" ><div id="birthday-title">{{$event_title}}</div> -<div id="birthday-title-end"></div> -{{foreach $events as $event}} -<div class="birthday-list" id="birthday-{{$event.id}}"></a> <a href="{{$event.link}}">{{$event.title}}</a> {{$event.date}} </div> -{{/foreach}} -</div> -{{/if}} - diff --git a/view/tpl/build_query.tpl b/view/tpl/build_query.tpl index 6ee97e171..2c55a8140 100755 --- a/view/tpl/build_query.tpl +++ b/view/tpl/build_query.tpl @@ -30,6 +30,7 @@ var bParam_mid = "{{$mid}}"; var bParam_verb = "{{$verb}}"; var bParam_net = "{{$net}}"; + var bParam_pf = "{{$pf}}"; function buildCmd() { var udargs = ((page_load) ? "/load" : ""); @@ -60,6 +61,7 @@ if(bParam_verb != "") bCmd = bCmd + "&verb=" + bParam_verb; if(bParam_net != "") bCmd = bCmd + "&net=" + bParam_net; if(bParam_page != 1) bCmd = bCmd + "&page=" + bParam_page; + if(bParam_pf != 0) bCmd = bCmd + "&pf=" + bParam_pf; return(bCmd); } diff --git a/view/tpl/channel_import.tpl b/view/tpl/channel_import.tpl index d702a2437..c7cbb1742 100755 --- a/view/tpl/channel_import.tpl +++ b/view/tpl/channel_import.tpl @@ -24,6 +24,7 @@ {{include file="field_checkbox.tpl" field=$make_primary}} {{include file="field_checkbox.tpl" field=$moving}} + {{include file="field_input.tpl" field=$newname}} <div id="import-common-desc" class="section-content-info-wrapper">{{$pleasewait}}</div> diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl index 1f0addc95..51178a9ba 100644 --- a/view/tpl/cloud_directory.tpl +++ b/view/tpl/cloud_directory.tpl @@ -65,10 +65,10 @@ <td class="cloud-index-tool">{{$item.attachIcon}}</td> <td class="cloud-index-tool"><div id="file-edit-{{$item.attachId}}" class="spinner-wrapper"><div class="spinner s"></div></div></td> <td class="cloud-index-tool"><i class="fakelink fa fa-pencil" onclick="filestorage(event, '{{$nick}}', {{$item.attachId}});"></i></td> - <td class="cloud-index-tool"><a href="#" title="{{$delete}}" onclick="dropItem('{{$item.fileStorageUrl}}/{{$item.attachId}}/delete', '#cloud-index-{{$item.attachId}},#cloud-tools-{{$item.attachId}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a></td> + <td class="cloud-index-tool"><a href="#" title="{{$delete}}" onclick="dropItem('{{$item.fileStorageUrl}}/{{$item.attachId}}/delete/json', '#cloud-index-{{$item.attachId}},#cloud-tools-{{$item.attachId}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a></td> {{else}} - <td></td><td></td><td></td><td></td> + <td></td><td></td><td></td>{{if $is_admin}}<td class="cloud-index-tool"><a href="#" title="{{$admin_delete}}" onclick="dropItem('{{$item.fileStorageUrl}}/{{$item.attachId}}/delete/json', '#cloud-index-{{$item.attachId}},#cloud-tools-{{$item.attachId}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a>{{else}}<td>{{/if}}</td> {{/if}} <td>{{*{{$item.type}}*}}</td> <td class="d-none d-md-table-cell">{{$item.sizeFormatted}}</td> diff --git a/view/tpl/common_pills.tpl b/view/tpl/common_pills.tpl new file mode 100755 index 000000000..e2b018d26 --- /dev/null +++ b/view/tpl/common_pills.tpl @@ -0,0 +1,26 @@ +<ul class="nav nav-pills flex-column"> + {{foreach $pills as $p}} + <li class="nav-item hover-fx-show"{{if $p.id}} id="{{$p.id}}"{{/if}}> + <a class="nav-link{{if $p.sel}} {{$p.sel}}{{/if}}" href="{{$p.url}}"{{if $p.title}} title="{{$p.title}}"{{/if}}{{if $p.sub}} onclick="{{if $p.sel}}closeOpen('{{$p.id}}_sub');{{else}}openClose('{{$p.id}}_sub');{{/if}} return false;"{{/if}}> + {{if $p.icon}}<i class="fa fa-fw fa-{{$p.icon}}"></i>{{/if}} + {{if $p.img}}<img class="menu-img-1" src="{{$p.img}}">{{/if}} + {{$p.label}} + {{if $p.sub}}<i class="fa fa-fw fa-caret-down hover-fx-hide"></i>{{/if}} + </a> + {{if $p.sub}} + <ul class="nav nav-pills flex-column ml-4" id="{{$p.id}}_sub"{{if !$p.sel}} style="display: none;"{{/if}}> + {{foreach $p.sub as $ps}} + <li class="nav-item"{{if $ps.id}} id="{{$ps.id}}"{{/if}}> + <a class="nav-link{{if $ps.sel}} {{$ps.sel}}{{/if}}" href="{{$ps.url}}"{{if $ps.title}} title="{{$ps.title}}"{{/if}}> + {{if $ps.icon}}<i class="fa fa-fw fa-{{$ps.icon}}"></i>{{/if}} + {{if $ps.img}}<img class="menu-img-1" src="{{$ps.img}}">{{/if}} + {{$ps.label}} + {{if $ps.lock}}<i class="fa fa-{{$ps.lock}} text-muted"></i>{{/if}} + </a> + </li> + {{/foreach}} + </ul> + {{/if}} + </li> + {{/foreach}} +</ul> diff --git a/view/tpl/common_widget.tpl b/view/tpl/common_widget.tpl new file mode 100644 index 000000000..e542031dc --- /dev/null +++ b/view/tpl/common_widget.tpl @@ -0,0 +1,6 @@ +<div class="widget"> + <h3> + {{$title}} + </h3> + {{$content}} +</div> diff --git a/view/tpl/connections.tpl b/view/tpl/connections.tpl index 0bf88b818..021c33146 100755 --- a/view/tpl/connections.tpl +++ b/view/tpl/connections.tpl @@ -1,7 +1,7 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper clearfix"> <div class="dropdown pull-right"> - <button type="button" class="btn btn-primary btn-sm" onclick="openClose('contacts-search-form'); $('#contacts-search').focus()"> + <button type="button" class="btn btn-primary btn-sm" onclick="openClose('contacts-search-form'); $('#contacts-search').focus();"> <i class="fa fa-search"></i> {{$label}} </button> <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="{{$sort}}"> @@ -16,11 +16,11 @@ {{if $finding}}<h2>{{$finding}}</h2>{{else}}<h2>{{$header}}{{if $total}} ({{$total}}){{/if}}</h2>{{/if}} </div> <div id="contacts-search-form" class="section-content-tools-wrapper"> - <form action="{{$cmd}}" method="get" > + <form action="{{$cmd}}" method="get" id="mimimi" name="contacts-search-form"> <div class="input-group form-group"> <input type="text" name="search" id="contacts-search" class="form-control" onfocus="this.select();" value="{{$search}}" placeholder="{{$desc}}" /> <div class="input-group-append"> - <button id="contacts-search-submit" class="btn btn-outline-secondary" type="submit" name="submit" value="{{$submit}}"><i class="fa fa-fw fa-search"></i></button> + <button id="contacts-search-submit" class="btn btn-outline-secondary" type="submit"><i class="fa fa-fw fa-search"></i></button> </div> </div> </form> diff --git a/view/tpl/contact_head.tpl b/view/tpl/contact_head.tpl deleted file mode 100755 index 72e7edbfb..000000000 --- a/view/tpl/contact_head.tpl +++ /dev/null @@ -1,30 +0,0 @@ -<script language="javascript" type="text/javascript" - src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script> - <script language="javascript" type="text/javascript"> - -tinyMCE.init({ - theme : "advanced", - mode : "{{$editselect}}", - elements: "contact-edit-info", - plugins : "bbcode", - theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor", - theme_advanced_buttons2 : "", - theme_advanced_buttons3 : "", - theme_advanced_toolbar_location : "top", - theme_advanced_toolbar_align : "center", - theme_advanced_styles : "blockquote,code", - gecko_spellcheck : true, - entity_encoding : "raw", - add_unload_trigger : false, - remove_linebreaks : false, - force_p_newlines : false, - force_br_newlines : true, - forced_root_block : '', - content_css: "{{$baseurl}}/view/custom_tinymce.css" - - -}); - - -</script> - diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index a408a83d2..ac6af40e9 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -29,9 +29,9 @@ <div class="p-2 clearfix wall-item-head{{if $item.is_new && !$item.title && !$item.event && !$item.is_comment}} wall-item-head-new rounded-top{{/if}}"> <div class="wall-item-info " id="wall-item-info-{{$item.id}}" > <div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}} h-card p-author" id="wall-item-photo-wrapper-{{$item.id}}"> - <img src="{{$item.thumb}}" class="fakelink wall-item-photo{{$item.sparkle}} u-photo p-name" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" data-toggle="dropdown" /> + <img src="{{$item.thumb}}" class="fakelink wall-item-photo{{$item.sparkle}} u-photo p-name" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" data-toggle="dropdown" /> {{if $item.thread_author_menu}} - <i class="fa fa-caret-down wall-item-photo-caret"></i> + <i class="fa fa-caret-down wall-item-photo-caret cursor-pointer" data-toggle="dropdown"></i> <div class="dropdown-menu"> {{foreach $item.thread_author_menu as $mitem}} <a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} >{{$mitem.title}}</a> @@ -43,7 +43,7 @@ </div> {{if $item.lock}} <div class="wall-item-lock dropdown"> - <i class="fa fa-lock lockview" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i> + <i class="fa fa-lock lockview{{if $item.privacy_warning}} text-danger{{/if}}" data-toggle="dropdown" title="{{$item.lock}}" onclick="lockview('item',{{$item.id}});" ></i> <div id="panel-{{$item.id}}" class="dropdown-menu"></div> </div> {{/if}} diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl index f94a2f24f..c6da3d8a4 100755 --- a/view/tpl/conv_list.tpl +++ b/view/tpl/conv_list.tpl @@ -31,7 +31,7 @@ <div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}} h-card p-author" id="wall-item-photo-wrapper-{{$item.id}}"> <img src="{{$item.thumb}}" class="fakelink wall-item-photo{{$item.sparkle}} u-photo p-name" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" data-toggle="dropdown" /></a> {{if $item.thread_author_menu}} - <i class="fa fa-caret-down wall-item-photo-caret"></i> + <i class="fa fa-caret-down wall-item-photo-caret cursor-pointer" data-toggle="dropdown"></i> <div class="dropdown-menu"> {{foreach $item.thread_author_menu as $mitem}} <a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} >{{$mitem.title}}</a> diff --git a/view/tpl/delegate.tpl b/view/tpl/delegate.tpl deleted file mode 100755 index cbaa8da86..000000000 --- a/view/tpl/delegate.tpl +++ /dev/null @@ -1,57 +0,0 @@ -<h3>{{$header}}</h3> - -<div id="delegate-desc" class="delegate-desc">{{$desc}}</div> - -{{if $managers}} -<h3>{{$head_managers}}</h3> - -{{foreach $managers as $x}} - -<div class="contact-block-div"> -<a class="contact-block-link" href="#" > -<img class="contact-block-img" src="{{$base}}/photo/thumb/{{$x.uid}}" title="{{$x.username}} ({{$x.nickname}})" /> -</a> -</div> - -{{/foreach}} -<div class="clear"></div> -<hr /> -{{/if}} - - -<h3>{{$head_delegates}}</h3> - -{{if $delegates}} -{{foreach $delegates as $x}} - -<div class="contact-block-div"> -<a class="contact-block-link" href="{{$base}}/delegate/remove/{{$x.uid}}" > -<img class="contact-block-img" src="{{$base}}/photo/thumb/{{$x.uid}}" title="{{$x.username}} ({{$x.nickname}})" /> -</a> -</div> - -{{/foreach}} -<div class="clear"></div> -{{else}} -{{$none}} -{{/if}} -<hr /> - - -<h3>{{$head_potentials}}</h3> -{{if $potentials}} -{{foreach $potentials as $x}} - -<div class="contact-block-div"> -<a class="contact-block-link" href="{{$base}}/delegate/add/{{$x.uid}}" > -<img class="contact-block-img" src="{{$base}}/photo/thumb/{{$x.uid}}" title="{{$x.username}} ({{$x.nickname}})" /> -</a> -</div> - -{{/foreach}} -<div class="clear"></div> -{{else}} -{{$none}} -{{/if}} -<hr /> - diff --git a/view/tpl/design_tools.tpl b/view/tpl/design_tools.tpl index bc7d46dc1..b4657cb7f 100644 --- a/view/tpl/design_tools.tpl +++ b/view/tpl/design_tools.tpl @@ -2,7 +2,7 @@ <h3>{{$title}}</h3> <div class="nav nav-pills flex-column"> <a class="nav-link" href="blocks/{{$who}}">{{$blocks}}</a> - <a class="nav-link" href="menu{{if $sys}}?f=&sys=1{{/if}}">{{$menus}}</a> + <a class="nav-link" href="menu/{{$who}}">{{$menus}}</a> <a class="nav-link" href="layouts/{{$who}}">{{$layout}}</a> <a class="nav-link" href="webpages/{{$who}}">{{$pages}}</a> </div> diff --git a/view/tpl/display-head.tpl b/view/tpl/display-head.tpl deleted file mode 100755 index 913784d98..000000000 --- a/view/tpl/display-head.tpl +++ /dev/null @@ -1,8 +0,0 @@ -<script> -$(document).ready(function() { - $(".comment-edit-wrapper textarea").editor_autocomplete(baseurl+"/acl?f=&n=1"); - // make auto-complete work in more places - $(".wall-item-comment-wrapper textarea").editor_autocomplete(baseurl+"/acl?f=&n=1"); -}); -</script> - diff --git a/view/tpl/edpost_head.tpl b/view/tpl/edpost_head.tpl index b2ab5db4e..4f39137ab 100755 --- a/view/tpl/edpost_head.tpl +++ b/view/tpl/edpost_head.tpl @@ -1,10 +1,13 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper"> - {{if $delete}} <div class="pull-right"> + {{if $cancel}} + <button id="dbtn-cancel" class="btn btn-warning btn-sm" onclick="itemCancel(); return false;">{{$cancel}}</button> + {{/if}} + {{if $delete}} <a href="item/drop/{{$id}}" id="delete-btn" class="btn btn-sm btn-danger" onclick="return confirmDelete();"><i class="fa fa-trash-o"></i> {{$delete}}</a> + {{/if}} </div> - {{/if}} <h2>{{$title}}</h2> <div class="clear"></div> </div> diff --git a/view/tpl/events_menu_side.tpl b/view/tpl/events_menu_side.tpl deleted file mode 100755 index b9a9062b1..000000000 --- a/view/tpl/events_menu_side.tpl +++ /dev/null @@ -1,8 +0,0 @@ -<div class="widget"> - <h3>{{$title}}</h3> - <ul class="nav nav-pills nav-stacked"> - <li><a href="#" onclick="changeView('changeView', 'month'); return false;">{{$month}}</a></li> - <li><a href="#" onclick="changeView('changeView', 'agendaWeek'); return false;">{{$week}}</a></li> - <li><a href="#" onclick="changeView('changeView', 'agendaDay'); return false;">{{$day}}</a></li> - </ul> -</div> diff --git a/view/tpl/events_reminder.tpl b/view/tpl/events_reminder.tpl deleted file mode 100755 index fd6a1a5c7..000000000 --- a/view/tpl/events_reminder.tpl +++ /dev/null @@ -1,10 +0,0 @@ -{{if $count}} -<div id="event-notice" class="birthday-notice fakelink {{$classtoday}}" onclick="openClose('event-wrapper');">{{$event_reminders}} ({{$count}})</div> -<div id="event-wrapper" style="display: none;" ><div id="event-title">{{$event_title}}</div> -<div id="event-title-end"></div> -{{foreach $events as $event}} -<div class="event-list" id="event-{{$event.id}}"></a> <a href="events/{{$event.link}}">{{$event.title}}</a> {{$event.date}} </div> -{{/foreach}} -</div> -{{/if}} - diff --git a/view/tpl/field_acheckbox.tpl b/view/tpl/field_acheckbox.tpl index c87b9ac79..1810e1ee1 100755 --- a/view/tpl/field_acheckbox.tpl +++ b/view/tpl/field_acheckbox.tpl @@ -5,11 +5,12 @@ </td> {{if $notself}} <td class="abook-them"> - {{if $field.2}}<i class="fa fa-check-square-o"></i>{{else}}<i class="fa fa-square-o"></i>{{/if}} + {{if $field.2 === 1}}<i class="fa fa-check-square-o"></i>{{/if}} + {{if $field.2 === 0}}<i class="fa fa-square-o"></i>{{/if}} </td> {{/if}} <td class="abook-me"> - {{if $self || !$field.5 || $twocol }} + {{if $self || !$field.5 }} <input type="checkbox" name='{{$field.0}}' class='abook-edit-me' id='me_id_{{$field.0}}' value="{{$field.4}}" {{if $field.3}}checked="checked"{{/if}} /> {{/if}} {{if $notself && $field.5}} diff --git a/view/tpl/group_drop.tpl b/view/tpl/group_drop.tpl deleted file mode 100755 index 627debc80..000000000 --- a/view/tpl/group_drop.tpl +++ /dev/null @@ -1,7 +0,0 @@ -<div class="group-delete-wrapper button" id="group-delete-wrapper-{{$id}}" > - <a href="group/drop/{{$id}}?t={{$form_security_token}}" - onclick="return confirmDelete();" - id="group-delete-icon-{{$id}}" - class="group-delete-icon btn btn-outline-secondary" title="{{$delete}}" ><i class="fa fa-trash-o drop-icons"></i></a> -</div> -<div class="group-delete-end"></div> diff --git a/view/tpl/group_edit.tpl b/view/tpl/group_edit.tpl index d9412a6f7..88f037abe 100755 --- a/view/tpl/group_edit.tpl +++ b/view/tpl/group_edit.tpl @@ -1,26 +1,30 @@ -<div class="generic-content-wrapper-styled"> -<h2>{{$title}}</h2> - - -<div id="group-edit-wrapper" > - <form action="group/{{$gid}}" id="group-edit-form" method="post" > - <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> - - {{include file="field_input.tpl" field=$gname}} - {{include file="field_checkbox.tpl" field=$public}} - {{if $drop}}{{$drop}}{{/if}} - <div id="group-edit-submit-wrapper" > - <input type="submit" name="submit" value="{{$submit}}" > +<div class="generic-content-wrapper"> + <div class="section-title-wrapper"> + <div class="float-right"> + <button type="button" class="btn btn-sm btn-outline-secondary" onclick="openClose('group_tools')"><i class="fa fa-pencil"></i> {{$details_label}}</button> + <button id="fullscreen-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button> + <button id="inline-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button> </div> - <div id="group-edit-select-end" ></div> - </form> -</div> - + <h2>{{$title}}</h2> + </div> -{{if $groupeditor}} - <div id="group-update-wrapper"> - {{include file="groupeditor.tpl"}} + <div id="group_tools" class="clearfix section-content-tools-wrapper" style="display: none"> + <form action="group/{{$gid}}" id="group-edit-form" method="post" > + <input type='hidden' name='form_security_token' value='{{$form_security_token_edit}}'> + {{include file="field_input.tpl" field=$gname}} + {{include file="field_checkbox.tpl" field=$public}} + <a href="group/drop/{{$gid}}?t={{$form_security_token_drop}}" onclick="return confirmDelete();" class="btn btn-sm btn-danger"> + {{$delete}} + </a> + <button type="submit" name="submit" class="btn btn-sm btn-primary float-right">{{$submit}}</button> + </form> + </div> + <div class="section-content-info-wrapper"> + {{$desc}} + </div> + <div class="section-content-wrapper"> + <div id="group-update-wrapper" class="clearfix"> + {{include file="groupeditor.tpl"}} + </div> </div> -{{/if}} -{{if $desc}}<div id="group-edit-desc">{{$desc}}</div>{{/if}} </div> diff --git a/view/tpl/groupeditor.tpl b/view/tpl/groupeditor.tpl index c79bb0a2a..94c275c7e 100755 --- a/view/tpl/groupeditor.tpl +++ b/view/tpl/groupeditor.tpl @@ -1,16 +1,12 @@ -<div id="group"> -<h3>{{$groupeditor.label_members}}</h3> -<div id="group-members" class="contact_list"> -{{foreach $groupeditor.members as $c}} {{$c}} {{/foreach}} -</div> -<div id="group-members-end"></div> -<hr id="group-separator" /> -</div> - -<div id="contacts"> -<h3>{{$groupeditor.label_contacts}}</h3> -<div id="group-all-contacts" class="contact_list"> -{{foreach $groupeditor.contacts as $m}} {{$m}} {{/foreach}} -</div> -<div id="group-all-contacts-end"></div> +<div id="contacts" class="list-group float-left w-50 pr-2"> + <h3>{{$groupeditor.label_contacts}}</h3> + <div id="group-all-contacts" class="contact_list"> + {{foreach $groupeditor.contacts as $m}} {{$m}} {{/foreach}} + </div> +</div> +<div id="group" class="list-group float-right w-50"> + <h3>{{$groupeditor.label_members}}</h3> + <div id="group-members" class="contact_list"> + {{foreach $groupeditor.members as $c}} {{$c}} {{/foreach}} + </div> </div> diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index c84126d26..dd64c3454 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -5,12 +5,14 @@ var plaintext = '{{$editselect}}'; var pretext = '{{$pretext}}'; function initEditor(cb){ - if (editor==false){ + if(editor == false){ $("#profile-jot-text-loading").show(); + $("#profile-jot-reset").removeClass('d-none'); {{$geotag}} if(plaintext == 'none') { $("#profile-jot-text-loading").hide(); - $("#profile-jot-text").css({ 'height': 200 }); + $(".jothidden").show(); + $("#profile-jot-text").addClass('jot-expanded'); {{if $bbco_autocomplete}} $("#profile-jot-text").bbco_autocomplete('{{$bbco_autocomplete}}'); // autocomplete bbcode {{/if}} @@ -21,82 +23,21 @@ function initEditor(cb){ $("#profile-jot-text").editor_autocomplete(baseurl+"/acl",[channelId]); // Also gives suggestions from current channel's connections {{/if}} editor = true; - $("a#jot-perms-icon").colorbox({ - 'inline' : true, - 'transition' : 'elastic' - }); - $(".jothidden").show(); - $("#profile-jot-text").addClass('jot-expanded'); if (typeof cb!="undefined") cb(); if(pretext.length) addeditortext(pretext); return; } - tinyMCE.init({ - theme : "advanced", - mode : "specific_textareas", - editor_selector: {{$editselect}}, - auto_focus: "profile-jot-text", - plugins : "bbcode,paste,autoresize, inlinepopups", - theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code", - theme_advanced_buttons2 : "", - theme_advanced_buttons3 : "", - theme_advanced_toolbar_location : "top", - theme_advanced_toolbar_align : "center", - theme_advanced_blockformats : "blockquote,code", - gecko_spellcheck : true, - paste_text_sticky : true, - entity_encoding : "raw", - add_unload_trigger : false, - remove_linebreaks : false, - force_p_newlines : false, - force_br_newlines : true, - forced_root_block : '', - convert_urls: false, - content_css: "{{$baseurl}}/view/custom_tinymce.css", - theme_advanced_path : false, - file_browser_callback : "fcFileBrowser", - setup : function(ed) { - cPopup = null; - ed.onKeyDown.add(function(ed,e) { - if(cPopup !== null) - cPopup.onkey(e); - }); - - ed.onKeyUp.add(function(ed, e) { - var txt = tinyMCE.activeEditor.getContent(); - match = txt.match(/@([^ \n]+)$/); - if(match!==null) { - if(cPopup === null) { - cPopup = new ACPopup(this,baseurl+"/acl"); - } - if(cPopup.ready && match[1]!==cPopup.searchText) cPopup.search(match[1]); - if(! cPopup.ready) cPopup = null; - } - else { - if(cPopup !== null) { cPopup.close(); cPopup = null; } - } - }); - - ed.onInit.add(function(ed) { - ed.pasteAsPlainText = true; - $("#profile-jot-text-loading").hide(); - $(".jothidden").show(); - if (typeof cb!="undefined") cb(); - }); - - } - }); - - editor = true; + editor = true; } else { if (typeof cb!="undefined") cb(); } } function enableOnUser(){ - if (editor) return; - $(this).val(""); + if(editor) + return; + initEditor(); } </script> @@ -110,8 +51,7 @@ var activeCommentID = 0; var activeCommentText = ''; $(document).ready(function() { - - /* enable tinymce on focus and click */ + $("#profile-jot-text").focus(enableOnUser); $("#profile-jot-text").click(enableOnUser); @@ -157,6 +97,7 @@ var activeCommentText = ''; $('#invisible-comment-upload').fileupload({ url: 'wall_attach/{{$nickname}}', dataType: 'json', + dropZone: $(), maxChunkSize: 4 * 1024 * 1024, add: function(e,data) { @@ -357,6 +298,24 @@ var activeCommentText = ''; } } + function itemCancel() { + $("#jot-title").val(''); + $("#profile-jot-text").val(''); + $("#jot-category").tagsinput('removeAll'); + + postSaveChanges('clean'); + + {{if $reset}} + $(".jothidden").hide(); + $("#profile-jot-text").removeClass('jot-expanded'); + $("#profile-jot-reset").addClass('d-none'); + $("#jot-preview-content").html('').hide(); + editor = false; + {{else}} + window.history.back(); + {{/if}} + } + function itemFiler(id) { if($('#item-filer-dialog').length) $('#item-filer-dialog').remove(); @@ -524,10 +483,13 @@ var activeCommentText = ''; } - // file drag hover - function DragDropUploadFileHover(e) { - e.target.className = (e.type == "dragover" ? "hover" : ""); - } + // file drag hover + function DragDropUploadFileHover(e) { + if(e.type == 'dragover') + $(e.target).addClass('hover'); + else + $(e.target).removeClass('hover'); + } // file selection function DragDropUploadFileSelectHandler(e) { @@ -536,7 +498,7 @@ var activeCommentText = ''; DragDropUploadFileHover(e); // open editor if it isn't yet initialised if (!editor) { - initEditor(); + enableOnUser(); } linkdrop(e); @@ -565,7 +527,7 @@ $( document ).on( "click", ".wall-item-delete-link,.page-delete-link,.layout-del <script> var postSaveTimer = null; - function postSaveChanges(action, type) { + function postSaveChanges(action) { if({{$auto_save_draft}}) { var doctype = $('#jot-webpage').val(); @@ -575,7 +537,7 @@ $( document ).on( "click", ".wall-item-delete-link,.page-delete-link,.layout-del localStorage.setItem("post_title" + postid, $("#jot-title").val()); localStorage.setItem("post_body" + postid, $("#profile-jot-text").val()); if($("#jot-category").length) - localStorage.setItem("post_category + postid", $("#jot-category").val()); + localStorage.setItem("post_category" + postid, $("#jot-category").val()); } if(action == 'start') { @@ -628,7 +590,7 @@ $( document ).on( "click", ".wall-item-delete-link,.page-delete-link,.layout-del openEditor = true; } if(openEditor) { - initEditor(); + enableOnUser(); } } else { postSaveChanges('clean'); diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 9aa330c40..0d1b4bd0d 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -9,6 +9,7 @@ </div> {{/if}} <div class="mb-4" id="profile-jot-wrapper"> + {{if $parent}} <input type="hidden" name="parent" value="{{$parent}}" /> {{/if}} @@ -41,6 +42,11 @@ </div> {{/if}} <div id="jot-text-wrap"> + {{if $reset}} + <button id="profile-jot-reset" class="btn btn-outline-secondary btn-sm d-none border-0" title="{{$reset}}" onclick="itemCancel(); return false;"> + <i class="fa fa-close"></i> + </button> + {{/if}} <textarea class="profile-jot-text" id="profile-jot-text" name="body" tabindex="2" placeholder="{{$placeholdtext}}" >{{$content}}</textarea> </div> {{if $attachment}} diff --git a/view/tpl/js_strings.tpl b/view/tpl/js_strings.tpl index 4243c2ea5..01fc3f993 100755 --- a/view/tpl/js_strings.tpl +++ b/view/tpl/js_strings.tpl @@ -23,6 +23,18 @@ 'linkurl' : "{{$linkurl}}", 'leavethispage' : "{{$leavethispage}}", 'location' : "{{$location}}", + 'lovely' : "{{$lovely}}", + 'wonderful' : "{{$wonderful}}", + 'fantastic' : "{{$fantastic}}", + 'great' : "{{$great}}", + 'nick_invld1' : "{{$nick_invld1}}", + 'nick_invld2' : "{{$nick_invld2}}", + 'nick_valid' : "{{$nick_valid}}", + 'name_empty' : "{{$name_empty}}", + 'name_ok1' : "{{$name_ok1}}", + 'name_ok2' : "{{$name_ok2}}", + + 't01' : "{{$t01}}", 't02' : "{{$t02}}", diff --git a/view/tpl/mail_conv.tpl b/view/tpl/mail_conv.tpl index 759517b7f..cd810e999 100755 --- a/view/tpl/mail_conv.tpl +++ b/view/tpl/mail_conv.tpl @@ -6,7 +6,7 @@ <div class="mail-conv-detail"> {{if $mail.is_recalled}}<strong>{{$mail.is_recalled}}</strong>{{/if}} <div class="wall-item-name"><a class="wall-item-name-link" href="{{$mail.from_url}}">{{$mail.from_name}}</a></div> - <div class="autotime wall-item-ago" title="{{$mail.date}}">{{$mail.date}}</div> + <div class="autotime wall-item-ago" title="{{$mail.date}}"></div> </div> </div> <div class="clearfix mail-conv-content"> diff --git a/view/tpl/mail_list.tpl b/view/tpl/mail_list.tpl index 65d8dcdb4..a1784e1e6 100755 --- a/view/tpl/mail_list.tpl +++ b/view/tpl/mail_list.tpl @@ -2,6 +2,6 @@ <a href="mail/{{$message.mailbox}}/{{$message.id}}" class="nav-link{{if $message.selected}} active{{/if}}"> <span class="{{if ! $message.seen || $message.selected}}font-weight-bold{{/if}}">{{$message.subject}}</span><br> <span class="conv-participants">{{$message.from_name}} > {{$message.to_name}}</span><br> - <span class="wall-item-ago autotime" title="{{$message.date}}">{{$message.date}}</span> + <span class="wall-item-ago autotime" title="{{$message.date}}"></span> </a> </li> diff --git a/view/tpl/match.tpl b/view/tpl/match.tpl deleted file mode 100755 index a5ebb043c..000000000 --- a/view/tpl/match.tpl +++ /dev/null @@ -1,16 +0,0 @@ -<div class="profile-match-wrapper"> - <div class="profile-match-photo"> - <a href="{{$url}}"> - <img src="{{$photo}}" alt="{{$name}}" title="{{$name}}[{{$tags}}]" /> - </a> - </div> - <div class="profile-match-break"></div> - <div class="profile-match-name"> - <a href="{{$url}}" title="{{$name}}[{{$tags}}]">{{$name}}</a> - </div> - <div class="profile-match-end"></div> - {{if $connlnk}} - <div class="profile-match-connect"><a href="{{$connlnk}}" title="{{$conntxt}}"><i class="fa fa-plus connect-icon"></i> {{$conntxt}}</a></div> - {{/if}} - -</div> diff --git a/view/tpl/menuedit.tpl b/view/tpl/menuedit.tpl index 84b16dc0b..3558bdbaa 100644 --- a/view/tpl/menuedit.tpl +++ b/view/tpl/menuedit.tpl @@ -11,7 +11,7 @@ </div> {{/if}} <div id="menu-creator" class="section-content-tools-wrapper" style="display: {{$display}};"> - <form id="menuedit" action="menu{{if $menu_id}}/{{$menu_id}}{{/if}}{{if $sys}}?f=&sys=1{{/if}}" method="post" > + <form id="menuedit" action="menu/{{$nick}}{{if $menu_id}}/{{$menu_id}}{{/if}}{{if $sys}}?f=&sys=1{{/if}}" method="post" > {{if $menu_id}} <input type="hidden" name="menu_id" value="{{$menu_id}}" /> {{/if}} diff --git a/view/tpl/menulist.tpl b/view/tpl/menulist.tpl index e23035062..f9c925472 100644 --- a/view/tpl/menulist.tpl +++ b/view/tpl/menulist.tpl @@ -25,11 +25,11 @@ {{foreach $menus as $m }} <tr id="menu-list-item-{{$m.menu_id}}"> <td>{{if $m.bookmark}}<i class="fa fa-bookmark menu-list-tool" title="{{$bmark}}" ></i>{{/if}}</td> - <td><a href="mitem/{{$m.menu_id}}{{if $sys}}?f=&sys=1{{/if}}" title="{{$hintcontent}}">{{$m.menu_name}}</a></td> + <td><a href="mitem/{{$nick}}/{{$m.menu_id}}{{if $sys}}?f=&sys=1{{/if}}" title="{{$hintcontent}}">{{$m.menu_name}}</a></td> <td>{{$m.menu_desc}}</td> - <td class="menu-list-tool"><a href="menu/{{$m.menu_id}}{{if $sys}}?f=&sys=1{{/if}}" title="{{$hintedit}}"><i class="fa fa-pencil"></i></a></td> + <td class="menu-list-tool"><a href="menu/{{$nick}}/{{$m.menu_id}}{{if $sys}}?f=&sys=1{{/if}}" title="{{$hintedit}}"><i class="fa fa-pencil"></i></a></td> <td class="menu-list-tool"><a href="rpost?attachment={{$m.element}}" title="{{$share}}"><i class="fa fa-share-square-o"></i></a></td> - <td class="menu-list-tool"><a href="#" title="{{$hintdrop}}" onclick="dropItem('menu/{{$m.menu_id}}/drop{{if $sys}}?f=&sys=1{{/if}}', '#menu-list-item-{{$m.menu_id}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a></td> + <td class="menu-list-tool"><a href="#" title="{{$hintdrop}}" onclick="dropItem('menu/{{$nick}}/{{$m.menu_id}}/drop{{if $sys}}?f=&sys=1{{/if}}', '#menu-list-item-{{$m.menu_id}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a></td> <td class="d-none d-md-table-cell">{{$m.menu_created}}</td> <td class="d-none d-md-table-cell">{{$m.menu_edited}}</td> </tr> diff --git a/view/tpl/micropro_card.tpl b/view/tpl/micropro_card.tpl new file mode 100644 index 000000000..a3c693dbd --- /dev/null +++ b/view/tpl/micropro_card.tpl @@ -0,0 +1,5 @@ +<a class="list-group-item{{if $class}} {{$class}}{{/if}} fakelink" href="{{if $click}}#{{else}}{{$url}}{{/if}}" {{if $click}}onclick="{{$click}}"{{/if}}> + <img class="menu-img-3" src="{{$photo}}" title="{{$title}}" alt="" />{{if $oneway}}<i class="fa fa-fw fa-minus-circle oneway-overlay text-danger"></i>{{/if}} + <span class="contactname">{{$name}}</span> + <span class="dropdown-sub-text">{{$addr}}<br>{{$network}}</span> +</a> diff --git a/view/tpl/mitemedit.tpl b/view/tpl/mitemedit.tpl index 9f696fc23..36be0b207 100644 --- a/view/tpl/mitemedit.tpl +++ b/view/tpl/mitemedit.tpl @@ -5,7 +5,7 @@ </div> {{/if}} <div id="menu-element-creator" class="section-content-tools-wrapper" style="display: {{$display}};"> - <form id="mitemedit" action="mitem/{{$menu_id}}{{if $mitem_id}}/{{$mitem_id}}{{/if}}{{if $sys}}?f=&sys=1{{/if}}" method="post" class="acl-form" data-form_id="mitemedit" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'> + <form id="mitemedit" action="mitem/{{$nick}}/{{$menu_id}}{{if $mitem_id}}/{{$mitem_id}}{{/if}}{{if $sys}}?f=&sys=1{{/if}}" method="post" class="acl-form" data-form_id="mitemedit" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'> <input type="hidden" name="menu_id" value="{{$menu_id}}" /> {{if $mitem_id}} <input type="hidden" name="mitem_id" value="{{$mitem_id}}" /> diff --git a/view/tpl/mitemlist.tpl b/view/tpl/mitemlist.tpl index b28cdfc7e..1e6302868 100644 --- a/view/tpl/mitemlist.tpl +++ b/view/tpl/mitemlist.tpl @@ -24,8 +24,8 @@ <td width="1%">{{$m.mitem_desc}}</td> <td width="96%"><a href="{{$m.mitem_link}}">{{$m.mitem_link}}</a></td> <td width="1%" class="mitem-list-tool dropdown">{{if $m.allow_cid || $m.allow_gid || $m.deny_cid || $m.deny_gid}}<i class="fa fa-lock lockview" data-toggle="dropdown" onclick="lockview('menu_item',{{$m.mitem_id}});" ></i><ul id="panel-{{$m.mitem_id}}" class="lockview-panel dropdown-menu"></ul>{{/if}}</td> - <td width="1%" class="mitem-list-tool"><a href="mitem/{{$menu_id}}/{{$m.mitem_id}}" title="{{$hintedit}}"><i class="fa fa-pencil"></i></a></td> - <td width="1%" class="mitem-list-tool"><a href="#" title="{{$hintdrop}}" onclick="dropItem('mitem/{{$menu_id}}/{{$m.mitem_id}}/drop', '#mitem-list-item-{{$m.mitem_id}}, #pmenu-item-{{$m.mitem_id}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a></td> + <td width="1%" class="mitem-list-tool"><a href="mitem/{{$nick}}/{{$menu_id}}/{{$m.mitem_id}}" title="{{$hintedit}}"><i class="fa fa-pencil"></i></a></td> + <td width="1%" class="mitem-list-tool"><a href="#" title="{{$hintdrop}}" onclick="dropItem('mitem/{{$nick}}/{{$menu_id}}/{{$m.mitem_id}}/drop', '#mitem-list-item-{{$m.mitem_id}}, #pmenu-item-{{$m.mitem_id}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a></td> </tr> {{/foreach}} </table> diff --git a/view/tpl/myapps.tpl b/view/tpl/myapps.tpl index 0ac836b38..2cc747436 100755 --- a/view/tpl/myapps.tpl +++ b/view/tpl/myapps.tpl @@ -3,7 +3,7 @@ {{if $authed}} {{if $create}} <a href="appman" class="pull-right btn btn-success btn-sm"><i class="fa fa-pencil-square-o"></i> {{$create}}</a> - {{else}} + {{elseif $manage}} <a href="apps/edit{{if $cat.0}}/?f=&cat={{$cat.0}}{{/if}}" class="pull-right btn btn-primary btn-sm">{{$manage}}</a> {{/if}} {{/if}} diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl index 7bc8df8d5..0eb0a964c 100755 --- a/view/tpl/navbar_default.tpl +++ b/view/tpl/navbar_default.tpl @@ -27,6 +27,9 @@ {{foreach $nav.usermenu as $usermenu}} <a class="dropdown-item{{if $usermenu.2}} active{{/if}}" href="{{$usermenu.0}}" title="{{$usermenu.3}}" role="menuitem" id="{{$usermenu.4}}">{{$usermenu.1}}</a> {{/foreach}} + {{if $nav.group}} + <a class="dropdown-item" href="{{$nav.group.0}}" title="{{$nav.group.3}}" role="menuitem" id="{{$nav.group.4}}">{{$nav.group.1}}</a> + {{/if}} {{if $nav.manage}} <a class="dropdown-item{{if $sel.name == Manage}} active{{/if}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}" role="menuitem" id="{{$nav.manage.4}}">{{$nav.manage.1}}</a> {{/if}} @@ -119,7 +122,7 @@ <ul id="nav-right" class="navbar-nav ml-auto"> <li class="nav-item collapse clearfix" id="nav-search"> - <form class="form-inline" method="get" action="search" role="search"> + <form class="form-inline" method="get" action="{{$nav.search.4}}" role="search"> <input class="form-control form-control-sm mt-1 mr-2" id="nav-search-text" type="text" value="" placeholder="{{$help}}" name="search" title="{{$nav.search.3}}" onclick="this.submit();" onblur="closeMenu('nav-search'); openMenu('nav-search-btn');"/> </form> <div id="nav-search-spinner" class="spinner-wrapper"> diff --git a/view/tpl/new_channel.tpl b/view/tpl/new_channel.tpl index f415e4e2c..51880e1f6 100755 --- a/view/tpl/new_channel.tpl +++ b/view/tpl/new_channel.tpl @@ -3,6 +3,7 @@ <h2>{{$title}}</h2> </div> <div class="section-content-wrapper"> + {{if ! $default_role}} <div class="section-content-info-wrapper"> {{$desc}} </div> @@ -11,6 +12,7 @@ {{$channel_usage_message}} </div> {{/if}} + {{/if}} <form action="new_channel" method="post" id="newchannel-form"> {{if $default_role}} <input type="hidden" name="permissions_role" value="{{$default_role}}" /> @@ -19,14 +21,11 @@ {{/if}} {{include file="field_input.tpl" field=$name}} - <div id="name-spinner" class="spinner-wrapper"><div class="spinner m"></div></div> {{include file="field_input.tpl" field=$nickname}} - <div id="nick-spinner" class="spinner-wrapper"><div class="spinner m"></div></div> + <button class="btn btn-primary" type="submit" id="newchannel-submit-button">{{$submit}}</button> - <button class="btn btn-secondary" name="validate" id="newchannel-validate-button" value="{{$validate}}" onclick="validate_channel(); return false;">{{$validate}}</button> - <button class="btn btn-primary" type="submit" name="submit" id="newchannel-submit-button" value="{{$submit}}" >{{$submit}}</button> <div id="newchannel-submit-end" class="clear"></div> <div id="newchannel-import-link" class="descriptive-paragraph" >{{$label_import}}</div> diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl index 215fddd08..068441997 100644 --- a/view/tpl/notifications_widget.tpl +++ b/view/tpl/notifications_widget.tpl @@ -127,12 +127,20 @@ {{$no_notifications}}<span class="jumping-dots"><span class="dot-1">.</span><span class="dot-2">.</span><span class="dot-3">.</span></span> </div> <div id="nav-notifications-template" rel="template"> - <a class="list-group-item clearfix notification {5}" href="{0}" title="{2} {3}" data-b64mid="{6}" data-notify_id="{7}" data-thread_top="{8}" data-contact_name="{2}"> + <a class="list-group-item clearfix notification {5}" href="{0}" title="{2}" data-b64mid="{6}" data-notify_id="{7}" data-thread_top="{8}" data-contact_name="{2}"> <img class="menu-img-3" data-src="{1}"> <span class="contactname">{2}</span> <span class="dropdown-sub-text">{3}<br>{4}</span> </a> </div> + <div id="nav-notifications-forums-template" rel="template"> + <a class="list-group-item clearfix notification notification-forum" href="{0}" title="{3}" data-b64mid="{6}" data-notify_id="{7}" data-thread_top="{8}" data-contact_name="{2}"> + <span class="float-right badge badge-{{$notification.severity}}">{9}</span> + <img class="menu-img-1" src="{1}"> + <span class="">{2}</span> + <i class="fa fa-{10} text-muted"></i> + </a> + </div> <div id="notifications" class="navbar-nav"> {{foreach $notifications as $notification}} <div class="collapse {{$notification.type}}-button"> @@ -152,15 +160,19 @@ </div> {{/if}} {{if $notification.filter}} + {{if $notification.filter.posts_label}} <div class="list-group-item cursor-pointer" id="tt-{{$notification.type}}-only"> <i class="fa fa-fw fa-filter"></i> {{$notification.filter.posts_label}} </div> + {{/if}} + {{if $notification.filter.name_label}} <div class="list-group-item clearfix notifications-textinput" id="cn-{{$notification.type}}-only"> <div class="text-muted notifications-textinput-filter"><i class="fa fa-fw fa-filter"></i></div> <input id="cn-{{$notification.type}}-input" type="text" class="form-control form-control-sm" placeholder="{{$notification.filter.name_label}}"> <div id="cn-{{$notification.type}}-input-clear" class="text-muted notifications-textinput-clear d-none"><i class="fa fa-times"></i></div> </div> {{/if}} + {{/if}} <div id="nav-{{$notification.type}}-menu" class=""> {{$loading}}<span class="jumping-dots"><span class="dot-1">.</span><span class="dot-2">.</span><span class="dot-3">.</span></span> </div> diff --git a/view/tpl/privacy_groups.tpl b/view/tpl/privacy_groups.tpl new file mode 100644 index 000000000..b4e27ef2c --- /dev/null +++ b/view/tpl/privacy_groups.tpl @@ -0,0 +1,28 @@ +<div class="generic-content-wrapper"> + <div class="clearfix section-title-wrapper"> + <button type="button" class="btn btn-sm btn-success float-right" onclick="openClose('group_tools')"><i class="fa fa-plus-circle"></i> {{$add_new_label}}</button> + <h2>{{$title}}</h2> + </div> + <div id="group_tools" class="clearfix section-content-tools-wrapper"{{if ! $new}} style="display: none"{{/if}}> + <form action="group/new" id="group-edit-form" method="post" > + <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> + {{include file="field_input.tpl" field=$gname}} + {{include file="field_checkbox.tpl" field=$public}} + <button type="submit" name="submit" class="btn btn-sm btn-primary float-right">{{$submit}}</button> + </form> + </div> + + <table id="groups-index"> + <tr> + <th width="99%">{{$name_label}}</th> + <th width="1%">{{$count_label}}</th> + </tr> + + {{foreach $entries as $group}} + <tr id="groups-index-{{$group.id}}" class="group-index-row"> + <td><a href="group/{{$group.id}}">{{$group.name}}</a></td> + <td>{{$group.count}}</td> + </tr> + {{/foreach}} + </table> +</div> diff --git a/view/tpl/profile_tabs.tpl b/view/tpl/profile_tabs.tpl index e77da23f3..dd9fbc52b 100644 --- a/view/tpl/profile_tabs.tpl +++ b/view/tpl/profile_tabs.tpl @@ -1,5 +1,5 @@ -<div class="dropdown-header text-white-50 d-lg-none" ><img src="{{$thumb}}" class="menu-img-1">{{$name}}</div> -<div class="dropdown-header text-black-50 d-none d-lg-block"><img src="{{$thumb}}" class="menu-img-1">{{$name}}</div> +<div class="dropdown-header text-white-50 d-lg-none" ><img src="{{$thumb}}" class="menu-img-1"> {{$name}}</div> +<div class="dropdown-header text-black-50 d-none d-lg-block"><img src="{{$thumb}}" class="menu-img-1"> {{$name}}</div> {{foreach $tabs as $tab}} <a class="dropdown-item{{if $tab.sel}} {{$tab.sel}}{{/if}}" href="{{$tab.url}}"{{if $tab.title}} title="{{$tab.title}}"{{/if}}><i class="fa fa-fw fa-{{$tab.icon}} generic-icons-nav"></i>{{$tab.label}}</a> {{/foreach}} diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl index 07e6dcc0a..262bf257f 100755 --- a/view/tpl/profile_vcard.tpl +++ b/view/tpl/profile_vcard.tpl @@ -11,7 +11,7 @@ <a class="dropdown-toggle" data-toggle="dropdown" href="#" ><i class="fa fa-pencil" title="{{$editmenu.edit.1}}"></i></a> <div class="dropdown-menu dropdown-menu-right" role="menu"> {{foreach $editmenu.menu.entries as $e}} - <a href="profiles/{{$e.id}}" class="dropdown-item"><img class="menu-img-1" src='{{$e.photo}}'>{{$e.profile_name}}</a> + <a href="profiles/{{$e.id}}" class="dropdown-item"><img class="menu-img-1" src='{{$e.photo}}'> {{$e.profile_name}}</a> {{/foreach}} <a href="profile_photo" class="dropdown-item">{{$editmenu.menu.chg_photo}}</a> {{if $editmenu.menu.cr_new}}<a href="profiles/new" id="profile-listing-new-link" class="dropdown-item">{{$editmenu.menu.cr_new}}</a>{{/if}} diff --git a/view/tpl/register.tpl b/view/tpl/register.tpl index 335d5f979..33ca46ba1 100755 --- a/view/tpl/register.tpl +++ b/view/tpl/register.tpl @@ -18,9 +18,6 @@ {{/if}} {{if $invitations}} - <div class="section-content-info-wrapper"> - <div id="register-invite-desc" class="descriptive-paragraph">{{$invite_desc}}</div> - </div> {{include file="field_input.tpl" field=$invite_code}} {{/if}} diff --git a/view/tpl/safesearch.tpl b/view/tpl/safesearch.tpl deleted file mode 100644 index 58ce22741..000000000 --- a/view/tpl/safesearch.tpl +++ /dev/null @@ -1,6 +0,0 @@ -<div id="directory_safemode" class="widget"> -<h3>{{$safemode}}</h3> -<ul class="nav nav-pills nav-stacked"> - <li><a href="toggle_safesearch">{{$toggle}}</a></li> -</ul> -</div> diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl index ebfb6a256..018e98989 100755 --- a/view/tpl/search_item.tpl +++ b/view/tpl/search_item.tpl @@ -23,7 +23,15 @@ <div class="p-2 clearfix wall-item-head{{if $item.is_new && !$item.title && !$item.event && !$item.is_comment}} wall-item-head-new rounded-top{{/if}}"> <div class="wall-item-info" id="wall-item-info-{{$item.id}}" > <div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}"> - <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}"><img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" /></a> + <img src="{{$item.thumb}}" class="fakelink wall-item-photo{{$item.sparkle}} u-photo p-name" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" data-toggle="dropdown" /> + {{if $item.thread_author_menu}} + <i class="fa fa-caret-down wall-item-photo-caret cursor-pointer" data-toggle="dropdown"></i> + <div class="dropdown-menu"> + {{foreach $item.thread_author_menu as $mitem}} + <a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} >{{$mitem.title}}</a> + {{/foreach}} + </div> + {{/if}} </div> </div> {{if $item.lock}} @@ -54,69 +62,53 @@ <div class="body-tags"> <span class="tag">{{$item.mentions}} {{$item.tags}} {{$item.categories}} {{$item.folders}}</span> </div> - {{** - {{if $item.mentions}} - <div class="body-tags" id="item-mentions"> - <span class="tag">{{$item.mentions}}</span> - </div> - {{/if}} - {{if $item.tags}} - <div class="body-tags" id="item-tags"> - <span class="tag">{{$item.tags}}</span> - </div> - {{/if}} - {{if $item.categories}} - <div class="body-tags" id="item-categories"> - <span class="tag">{{$item.categories}}</span> - </div> - {{/if}} - {{if $item.folders}} - <div class="body-tags" id="item-folders"> - <span class="tag">{{$item.folders}}</span> - </div> - {{/if}} - **}} </div> {{/if}} <div class="p-2 clearfix wall-item-tools"> - <div class="wall-item-tools-right btn-group pull-right"> - <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown"> - <i class="fa fa-cog"></i> - </button> - <div class="dropdown-menu dropdown-menu-right"> - {{if $item.thread_action_menu}} - {{foreach $item.thread_action_menu as $mitem}} - <a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} ><i class="fa fa-{{$mitem.icon}}"></i> {{$mitem.title}}</a></li> - {{/foreach}} - {{/if}} - {{if $item.drop.dropping}} - <a class="dropdown-item" href="item/drop/{{$item.id}}" onclick="return confirmDelete();" title="{{$item.drop.delete}}" ><i class="fa fa-trash-o"></i> {{$item.drop.delete}}</a></li> - {{/if}} - {{if $item.thread_author_menu}} - <div class="dropdown-divider"></div> - {{foreach $item.thread_author_menu as $mitem}} - <a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} >{{$mitem.title}}</a></li> - {{/foreach}} - {{/if}} + <div class="float-right wall-item-tools-right"> + <div class="btn-group"> + <div id="like-rotator-{{$item.id}}" class="spinner-wrapper"> + <div class="spinner s"></div> + </div> </div> + <div class="btn-group"> + <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown"> + <i class="fa fa-cog"></i> + </button> + <div class="dropdown-menu dropdown-menu-right"> + {{if $item.star}} + <a class="dropdown-item" href="#" onclick="dostar({{$item.id}}); return false;"><i id="starred-{{$item.id}}" class="fa fa-fw{{if $item.star.isstarred}} starred fa-star{{else}} unstarred fa-star-o{{/if}} generic-icons-nav" title="{{$item.star.toggle}}"></i>{{$item.star.toggle}}</a> + {{/if}} + {{if $item.thread_action_menu}} + {{foreach $item.thread_action_menu as $mitem}} + <a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} ><i class="fa fa-fw fa-{{$mitem.icon}} generic-icons-nav"></i>{{$mitem.title}}</a></li> + {{/foreach}} + {{/if}} + {{if $item.drop.dropping}} + <a class="dropdown-item" href="item/drop/{{$item.id}}" onclick="return confirmDelete();" title="{{$item.drop.delete}}" ><i class="fa fa-fw fa-trash-o generic-icons-nav"></i>{{$item.drop.delete}}</a></li> + {{/if}} + </div> + </div> + </div> + {{if $item.star && $item.star.isstarred}} + <div class="btn-group" id="star-button-{{$item.id}}"> + <button type="button" class="btn btn-outline-secondary btn-sm wall-item-like" onclick="dostar({{$item.id}});"><i class="fa fa-star"></i></button> </div> + {{/if}} {{if $item.attachments}} <div class="wall-item-tools-left btn-group"> <button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="fa fa-paperclip"></i></button> <div class="dropdown-menu">{{$item.attachments}}</div> </div> {{/if}} - {{if $item.mode === 'moderate'}} - <div class="wall-item-tools-left btn-group"> + <div class="wall-item-tools-left btn-group" id="wall-item-tools-left-{{$item.id}}"> + {{if $item.mode === 'moderate'}} <a href="moderate/{{$item.id}}/approve" class="btn btn-success btn-sm">{{$item.approve}}</a> <a href="moderate/{{$item.id}}/drop" class="btn btn-danger btn-sm">{{$item.delete}}</a> - + {{/if}} </div> - - - {{/if}} </div> </div> {{if $item.conv}} diff --git a/view/tpl/select_timezone.tpl b/view/tpl/select_timezone.tpl deleted file mode 100644 index 2820a54f4..000000000 --- a/view/tpl/select_timezone.tpl +++ /dev/null @@ -1,11 +0,0 @@ -{{* TODO: Make id configurabel *}} -<select id='timezone_select' name='timezone'> -{{foreach $continents as $continent => $cities}} -<optgroup label="{{$continent}}"> -{{foreach $cities as $city => $value}} -<option value='{{$value}}' {{if $value == $selected}}selected='selected'{{/if}}>{{$city}}</option> -{{/foreach}} -</optgroup> -{{/foreach}} -</select> - diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index d258f1992..3a05ea828 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -45,6 +45,7 @@ <div id="privacy-settings-collapse" class="collapse" role="tabpanel" aria-labelledby="privacy-settings" data-parent="#settings"> <div class="section-content-tools-wrapper"> {{include file="field_select_grouped.tpl" field=$role}} + {{$autoperms}} <div id="advanced-perm" style="display:{{if $permissions_set}}none{{else}}block{{/if}};"> <div class="form-group"> <button type="button" class="btn btn-outline-secondary" data-toggle="modal" data-target="#apsModal">{{$lbl_p2macro}}</button> @@ -146,6 +147,7 @@ {{include file="field_intcheckbox.tpl" field=$vnotify13}} {{/if}} {{include file="field_intcheckbox.tpl" field=$vnotify14}} + {{include file="field_intcheckbox.tpl" field=$vnotify15}} {{include file="field_intcheckbox.tpl" field=$always_show_in_notices}} {{include file="field_input.tpl" field=$evdays}} </div> diff --git a/view/tpl/settings_connectors.tpl b/view/tpl/settings_connectors.tpl deleted file mode 100755 index 8bea9ca63..000000000 --- a/view/tpl/settings_connectors.tpl +++ /dev/null @@ -1,10 +0,0 @@ -<div class="generic-content-wrapper-styled"> -<h1>{{$title}}</h1> - -<form action="settings/connectors" method="post" autocomplete="off"> -<input type='hidden' name='form_security_token' value='{{$form_security_token}}'> - -{{$settings_connectors}} - -</form> -</div> diff --git a/view/tpl/siteinfo.tpl b/view/tpl/siteinfo.tpl index a5b99fd83..4d9c53656 100755 --- a/view/tpl/siteinfo.tpl +++ b/view/tpl/siteinfo.tpl @@ -38,4 +38,8 @@ <br><br> <div>{{$prj_transport}} ({{$transport_link}})</div> +{{if $additional_fed}} +<div>{{$additional_text}} {{$additional_fed}}</div> +{{/if}} + </div> diff --git a/view/tpl/sources_edit.tpl b/view/tpl/sources_edit.tpl index 61f6e8cb0..094440ee7 100644 --- a/view/tpl/sources_edit.tpl +++ b/view/tpl/sources_edit.tpl @@ -8,6 +8,7 @@ <input type="hidden" id="id_abook" name="abook" value="{{$abook}}" /> {{include file="field_input.tpl" field=$name}} {{include file="field_input.tpl" field=$tags}} +{{include file="field_checkbox.tpl" field=$resend}} {{include file="field_textarea.tpl" field=$words}} <div class="sources-submit-wrapper" > diff --git a/view/tpl/sources_new.tpl b/view/tpl/sources_new.tpl index bbc22df84..7cda9998d 100644 --- a/view/tpl/sources_new.tpl +++ b/view/tpl/sources_new.tpl @@ -7,6 +7,7 @@ <input type="hidden" id="id_abook" name="abook" value="{{$abook}}" /> {{include file="field_input.tpl" field=$name}} {{include file="field_input.tpl" field=$tags}} +{{include file="field_checkbox.tpl" field=$resend}} {{include file="field_textarea.tpl" field=$words}} <div class="sources-submit-wrapper" > diff --git a/view/tpl/toggle_mobile_footer.tpl b/view/tpl/toggle_mobile_footer.tpl deleted file mode 100755 index 82c0197ba..000000000 --- a/view/tpl/toggle_mobile_footer.tpl +++ /dev/null @@ -1,2 +0,0 @@ -<a id="toggle_mobile_link" href="{{$toggle_link}}">{{$toggle_text}}</a> - diff --git a/view/tpl/usermenu.tpl b/view/tpl/usermenu.tpl index c51728c34..8bbfedd07 100644 --- a/view/tpl/usermenu.tpl +++ b/view/tpl/usermenu.tpl @@ -2,7 +2,7 @@ <div id="pmenu-{{$id}}" class="pmenu{{if !$class}} widget{{else}} {{$class}}{{/if}}"> {{/if}} {{if $menu.menu_desc}} - <h3 class="pmenu-title">{{$menu.menu_desc}}{{if $edit}} <a href="mitem/{{$menu.menu_id}}" title="{{$edit}}"><i class="fa fa-pencil fakelink" title="{{$edit}}"></i></a>{{/if}}</h3> + <h3 class="pmenu-title">{{$menu.menu_desc}}{{if $edit}} <a href="mitem/{{$nick}}/{{$menu.menu_id}}" title="{{$edit}}"><i class="fa fa-pencil fakelink" title="{{$edit}}"></i></a>{{/if}}</h3> {{/if}} {{if $items}} <ul class="pmenu-body{{if $wrap || !$class}} nav nav-pills flex-column{{elseif !$wrap || $class}} {{$class}}{{/if}}"> diff --git a/view/tpl/write_pages.tpl b/view/tpl/write_pages.tpl deleted file mode 100644 index 53146ee30..000000000 --- a/view/tpl/write_pages.tpl +++ /dev/null @@ -1,3 +0,0 @@ -<div id="write-pages" class="bigwidget"> -<span id="wp-new"><a href="{{$newurl}}">{{$new}}</a></span> <span id="wp-edit"><a href="{{$editurl}}">{{$edit}}</a></span> -</div> |