diff options
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/abook_edit.tpl | 24 | ||||
| -rwxr-xr-x | view/tpl/admin_security.tpl | 3 | ||||
| -rwxr-xr-x | view/tpl/admin_site.tpl | 1 | ||||
| -rwxr-xr-x | view/tpl/head.tpl | 1 | ||||
| -rwxr-xr-x | view/tpl/jot.tpl | 37 | ||||
| -rwxr-xr-x | view/tpl/nav.tpl | 374 | ||||
| -rwxr-xr-x | view/tpl/photo_view.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/profile_edit.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/rsd.tpl | 15 |
9 files changed, 249 insertions, 210 deletions
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl index 4fa810cb4..74ba6072d 100755 --- a/view/tpl/abook_edit.tpl +++ b/view/tpl/abook_edit.tpl @@ -3,18 +3,18 @@ {{if $notself}} <div class="dropdown pull-right"> <button id="connection-dropdown" class="btn btn-default btn-xs" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> - <i class="icon-caret-down"></i> + <i class="icon-caret-down"></i> {{$tools_label}} </button> <ul class="dropdown-menu" aria-labelledby="dLabel"> - <li><a href="{{$buttons.view.url}}" title="{{$buttons.view.title}}">{{$buttons.view.label}}</a></li> - <li><a href="{{$buttons.recent.url}}" title="{{$buttons.recent.title}}">{{$buttons.recent.label}}</a></li> + <li><a href="{{$tools.view.url}}" title="{{$tools.view.title}}">{{$tools.view.label}}</a></li> + <li><a href="{{$tools.recent.url}}" title="{{$tools.recent.title}}">{{$tools.recent.label}}</a></li> <li class="divider"></li> - <li><a href="#" title="{{$buttons.refresh.title}}" onclick="window.location.href='{{$buttons.refresh.url}}'; return false;">{{$buttons.refresh.label}}</a></li> - <li><a href="#" title="{{$buttons.block.title}}" onclick="window.location.href='{{$buttons.block.url}}'; return false;">{{$buttons.block.label}}</a></li> - <li><a href="#" title="{{$buttons.ignore.title}}" onclick="window.location.href='{{$buttons.ignore.url}}'; return false;">{{$buttons.ignore.label}}</a></li> - <li><a href="#" title="{{$buttons.archive.title}}" onclick="window.location.href='{{$buttons.archive.url}}'; return false;">{{$buttons.archive.label}}</a></li> - <li><a href="#" title="{{$buttons.hide.title}}" onclick="window.location.href='{{$buttons.hide.url}}'; return false;">{{$buttons.hide.label}}</a></li> - <li><a href="#" title="{{$buttons.delete.title}}" onclick="window.location.href='{{$buttons.delete.url}}'; return false;">{{$buttons.delete.label}}</a></li> + <li><a href="#" title="{{$tools.refresh.title}}" onclick="window.location.href='{{$tools.refresh.url}}'; return false;">{{$tools.refresh.label}}</a></li> + <li><a href="#" title="{{$tools.block.title}}" onclick="window.location.href='{{$tools.block.url}}'; return false;">{{$tools.block.label}}</a></li> + <li><a href="#" title="{{$tools.ignore.title}}" onclick="window.location.href='{{$tools.ignore.url}}'; return false;">{{$tools.ignore.label}}</a></li> + <li><a href="#" title="{{$tools.archive.title}}" onclick="window.location.href='{{$tools.archive.url}}'; return false;">{{$tools.archive.label}}</a></li> + <li><a href="#" title="{{$tools.hide.title}}" onclick="window.location.href='{{$tools.hide.url}}'; return false;">{{$tools.hide.label}}</a></li> + <li><a href="#" title="{{$tools.delete.title}}" onclick="window.location.href='{{$tools.delete.url}}'; return false;">{{$tools.delete.label}}</a></li> </ul> </div> {{/if}} @@ -22,11 +22,11 @@ </div> <div class="section-content-wrapper-np"> {{if $notself}} - {{foreach $buttons as $b}} - {{if $b.info}} + {{foreach $tools as $tool}} + {{if $tool.info}} <div class="section-content-danger-wrapper"> <div> - {{$b.info}} + {{$tool.info}} </div> </div> {{/if}} diff --git a/view/tpl/admin_security.tpl b/view/tpl/admin_security.tpl index 691db2d88..3823d8235 100755 --- a/view/tpl/admin_security.tpl +++ b/view/tpl/admin_security.tpl @@ -15,9 +15,6 @@ {{include file="field_textarea.tpl" field=$whitelisted_channels}} {{include file="field_textarea.tpl" field=$blacklisted_channels}} - - {{include file="field_checkbox.tpl" field=$embed_coop}} - {{include file="field_textarea.tpl" field=$embed_allow}} {{include file="field_textarea.tpl" field=$embed_deny}} diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index 54f625e0b..6b8729ee6 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -49,6 +49,7 @@ {{include file="field_input.tpl" field=$frontpage}} {{include file="field_checkbox.tpl" field=$mirror_frontpage}} {{include file="field_checkbox.tpl" field=$login_on_homepage}} + {{include file="field_checkbox.tpl" field=$enable_context_help}} {{if $directory_server}} {{include file="field_select.tpl" field=$directory_server}} {{/if}} diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl index 9fcdf1735..9502dd91c 100755 --- a/view/tpl/head.tpl +++ b/view/tpl/head.tpl @@ -11,6 +11,7 @@ {{$head_js}} <link rel="shortcut icon" href="{{$icon}}" /> <link rel="search" href="{{$baseurl}}/opensearch" type="application/opensearchdescription+xml" title="{{$osearch}}" /> +<link rel="EditURI" type="application/rsd+xml" href="{{$baseurl}}/rsd.xml" /> <script> var updateInterval = {{$update_interval}}; var localUser = {{if $local_channel}}{{$local_channel}}{{else}}false{{/if}}; diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 026c586a0..9c5ddc620 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -68,27 +68,31 @@ </div> {{/if}} {{if $visitor}} - <div class="btn-group hidden-xs"> + <div class="btn-group hidden-xs hidden-sm"> {{if $writefiles}} <button id="wall-file-upload" class="btn btn-default btn-sm" title="{{$attach}}" > <i id="wall-file-upload-icon" class="icon-paper-clip jot-icons"></i> </button> {{/if}} + {{if $weblink}} <button id="profile-link-wrapper" class="btn btn-default btn-sm" title="{{$weblink}}" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"> <i id="profile-link" class="icon-link jot-icons"></i> </button> + {{/if}} </div> <div class="btn-group hidden-xs hidden-sm"> + {{if $setloc}} <button id="profile-location-wrapper" class="btn btn-default btn-sm" title="{{$setloc}}" onclick="jotGetLocation();return false;"> <i id="profile-location" class="icon-globe jot-icons"></i> </button> + {{/if}} {{if $noloc}} <button id="profile-nolocation-wrapper" class="btn btn-default btn-sm" title="{{$noloc}}" onclick="jotClearLocation();return false;" disabled="disabled"> <i id="profile-nolocation" class="icon-circle-blank jot-icons"></i> </button> {{/if}} {{else}} - <div class="btn-group hidden-xs"> + <div class="btn-group hidden-xs hidden-sm"> {{/if}} {{if $feature_expire}} <button id="profile-expire-wrapper" class="btn btn-default btn-sm" title="{{$expires}}" onclick="jotGetExpiry();return false;"> @@ -111,40 +115,45 @@ </button> {{/if}} </div> + {{if $writefiles || $weblink || $setloc || $noloc || $feature_expire || $feature_encrypt || $feature_voting}} <div class="btn-group visible-xs visible-sm"> <button type="button" id="more-tools" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false"> <i id="more-tools-icon" class="icon-caret-down jot-icons"></i> </button> - <ul class="dropdown-menu dropdown-menu-right" role="menu"> - <li class="visible-xs"><a href="#" onclick="preview_post();return false;"><i class="icon-eye-open"></i> {{$preview}}</a></li> + <ul class="dropdown-menu dropdown-menu" role="menu"> {{if $visitor}} - <li class="divider visible-xs"></li> - {{if $writefiles}}<li class="visible-xs"><a id="wall-file-upload-sub" href="#" ><i class="icon-paper-clip"></i> {{$attach}}</a></li>{{/if}} - <li class="visible-xs"><a href="#" onclick="jotGetLink(); return false;"><i class="icon-link"></i> {{$weblink}}</a></li> + {{if $writefiles}} + <li><a id="wall-file-upload-sub" href="#" ><i class="icon-paper-clip"></i> {{$attach}}</a></li> + {{/if}} + {{if $weblink}} + <li><a href="#" onclick="jotGetLink(); return false;"><i class="icon-link"></i> {{$weblink}}</a></li> + {{/if}} +i {{if $setloc}} + <li><a href="#" onclick="jotGetLocation(); return false;"><i class="icon-globe"></i> {{$setloc}}</a></li> {{/if}} - <li class="divider visible-xs"></li> - <li class="visible-xs visible-sm"><a href="#" onclick="jotGetLocation(); return false;"><i class="icon-globe"></i> {{$setloc}}</a></li> {{if $noloc}} - <li class="visible-xs visible-sm"><a href="#" onclick="jotClearLocation(); return false;"><i class="icon-circle-blank"></i> {{$noloc}}</a></li> + <li><a href="#" onclick="jotClearLocation(); return false;"><i class="icon-circle-blank"></i> {{$noloc}}</a></li> + {{/if}} {{/if}} {{if $feature_expire}} - <li class="visible-xs visible-sm"><a href="#" onclick="jotGetExpiry(); return false;"><i class="icon-eraser"></i> {{$expires}}</a></li> + <li><a href="#" onclick="jotGetExpiry(); return false;"><i class="icon-eraser"></i> {{$expires}}</a></li> {{/if}} {{if $feature_encrypt}} - <li class="visible-xs visible-sm"><a href="#" onclick="red_encrypt('{{$cipher}}','#profile-jot-text',$('#profile-jot-text').val());return false;"><i class="icon-key"></i> {{$encrypt}}</a></li> + <li><a href="#" onclick="red_encrypt('{{$cipher}}','#profile-jot-text',$('#profile-jot-text').val());return false;"><i class="icon-key"></i> {{$encrypt}}</a></li> {{/if}} {{if $feature_voting}} - <li class="visible-xs visible-sm"><a href="#" onclick="toggleVoting(); return false;"><i id="profile-voting-sub" class="icon-check-empty"></i> {{$voting}}</a></li> + <li><a href="#" onclick="toggleVoting(); return false;"><i id="profile-voting-sub" class="icon-check-empty"></i> {{$voting}}</a></li> {{/if}} </ul> </div> + {{/if}} </div> <div id="profile-rotator-wrapper"> <div id="profile-rotator"></div> </div> <div id="profile-jot-submit-right" class="btn-group pull-right"> {{if $preview}} - <button class="btn btn-default btn-sm hidden-xs" onclick="preview_post();return false;" title="{{$preview}}"> + <button class="btn btn-default btn-sm" onclick="preview_post();return false;" title="{{$preview}}"> <i class="icon-eye-open jot-icons" ></i> </button> {{/if}} diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 7f6c33c61..14fb8a982 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -1,195 +1,211 @@ -<div class="container-fluid"> - <div class="navbar-header"> - <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-1"> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - </button> - <button id="expand-tabs" type="button" class="navbar-toggle" data-toggle="collapse" data-target="#tabs-collapse-1"> - <i class="icon-circle-arrow-down" id="expand-tabs-icon"></i> - </button> - <button id="expand-aside" type="button" class="navbar-toggle" data-toggle="offcanvas" data-target="#region_1"> - <i class="icon-circle-arrow-right" id="expand-aside-icon"></i> - </button> - {{if $nav.help}} - <button id="help-btn" type="button" class="navbar-toggle" title="{{$nav.help.3}}" onclick="$('#help-content').toggleClass('help-content-open');"> - <i class="icon-question"></i> - </button> - {{/if}} - {{if $userinfo}} - <img class="dropdown-toggle fakelink" data-toggle="dropdown" id="avatar" src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"><span class="caret" id="usermenu-caret"></span> - {{if $localuser}} - <ul class="dropdown-menu" role="menu" aria-labelledby="avatar"> - {{foreach $nav.usermenu as $usermenu}} - <li role="presentation"><a href="{{$usermenu.0}}" title="{{$usermenu.3}}" role="menuitem" id="{{$usermenu.4}}">{{$usermenu.1}}</a></li> - {{/foreach}} - <li role="presentation" class="divider"></li> - {{if $nav.profiles}}<li role="presentation"><a href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" role="menuitem" id="{{$nav.profiles.4}}">{{$nav.profiles.1}}</a></li>{{/if}} - {{if $nav.settings}}<li role="presentation"><a href="{{$nav.settings.0}}" title="{{$nav.settings.3}}" role="menuitem" id="{{$nav.settings.4}}">{{$nav.settings.1}}</a></li>{{/if}} - {{if $nav.manage}}<li role="presentation"><a href="{{$nav.manage.0}}" title="{{$nav.manage.3}}" role="menuitem" id="{{$nav.manage.4}}">{{$nav.manage.1}}</a></li>{{/if}} - {{if $nav.channels}} - {{foreach $nav.channels as $chan}} - <li role="presentation" class="nav-channel-select"><a href="manage/{{$chan.channel_id}}" title="{{$chan.channel_name}}" role="menuitem">{{$chan.channel_name}}</a></li> - {{/foreach}} - {{/if}} - {{if $nav.admin}} - <li role="presentation" class="divider"></li> - <li role="presentation"><a href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" role="menuitem" id="{{$nav.admin.4}}">{{$nav.admin.1}}</a></li> - {{/if}} - {{if $nav.logout}} - <li role="presentation" class="divider"></li> - <li role="presentation"><a href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" role="menuitem" id="{{$nav.logout.4}}">{{$nav.logout.1}}</a></li> + <div class="container-fluid"> + <div class="navbar-header"> + <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-1"> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + </button> + <button id="expand-tabs" type="button" class="navbar-toggle" data-toggle="collapse" data-target="#tabs-collapse-1"> + <i class="icon-circle-arrow-down" id="expand-tabs-icon"></i> + </button> + <button id="expand-aside" type="button" class="navbar-toggle" data-toggle="offcanvas" data-target="#region_1"> + <i class="icon-circle-arrow-right" id="expand-aside-icon"></i> + </button> + {{if $nav.help.6}} + <button id="context-help-btn"class="navbar-toggle" type="button" onclick="contextualHelp(); return false;"> + <i class="icon-question-sign"></i> + </button> + {{/if}} + {{if $userinfo}} + <img class="dropdown-toggle fakelink" data-toggle="dropdown" id="avatar" src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"><span class="caret" id="usermenu-caret"></span> + {{if $localuser}} + <ul class="dropdown-menu" role="menu" aria-labelledby="avatar"> + {{foreach $nav.usermenu as $usermenu}} + <li role="presentation"><a href="{{$usermenu.0}}" title="{{$usermenu.3}}" role="menuitem" id="{{$usermenu.4}}">{{$usermenu.1}}</a></li> + {{/foreach}} + <li role="presentation" class="divider"></li> + {{if $nav.profiles}}<li role="presentation"><a href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" role="menuitem" id="{{$nav.profiles.4}}">{{$nav.profiles.1}}</a></li>{{/if}} + {{if $nav.settings}}<li role="presentation"><a href="{{$nav.settings.0}}" title="{{$nav.settings.3}}" role="menuitem" id="{{$nav.settings.4}}">{{$nav.settings.1}}</a></li>{{/if}} + {{if $nav.manage}}<li role="presentation"><a href="{{$nav.manage.0}}" title="{{$nav.manage.3}}" role="menuitem" id="{{$nav.manage.4}}">{{$nav.manage.1}}</a></li>{{/if}} + {{if $nav.channels}} + {{foreach $nav.channels as $chan}} + <li role="presentation" class="nav-channel-select"><a href="manage/{{$chan.channel_id}}" title="{{$chan.channel_name}}" role="menuitem">{{$chan.channel_name}}</a></li> + {{/foreach}} + {{/if}} + {{if $nav.admin}} + <li role="presentation" class="divider"></li> + <li role="presentation"><a href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" role="menuitem" id="{{$nav.admin.4}}">{{$nav.admin.1}}</a></li> + {{/if}} + {{if $nav.logout}} + <li role="presentation" class="divider"></li> + <li role="presentation"><a href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" role="menuitem" id="{{$nav.logout.4}}">{{$nav.logout.1}}</a></li> + {{/if}} + </ul> + {{else}} + {{if $nav.lock}} + <ul class="dropdown-menu" role="menu" aria-labelledby="avatar"> + <li role="presentation"><a href="{{$nav.lock.0}}" title="{{$nav.lock.3}}" role="menuitem">{{$nav.lock.3}}</a></li> + </ul> {{/if}} - </ul> - {{else}} - {{if $nav.lock}} - <ul class="dropdown-menu" role="menu" aria-labelledby="avatar"> - <li role="presentation"><a href="{{$nav.lock.0}}" title="{{$nav.lock.3}}" role="menuitem">{{$nav.lock.3}}</a></li> - </ul> {{/if}} {{/if}} - {{/if}} - </div> - <div class="collapse navbar-collapse" id="navbar-collapse-1"> - <ul class="nav navbar-nav navbar-left"> - {{if $nav.register}}<li class="{{$nav.register.2}}"><a href="{{$nav.register.0}}" title="{{$nav.register.3}}" id="{{$nav.register.4}}">{{$nav.register.1}}</a></li>{{/if}} - {{if !$userinfo}} + </div> + <div class="collapse navbar-collapse" id="navbar-collapse-1"> + <ul class="nav navbar-nav navbar-left"> + {{if $nav.register}}<li class="{{$nav.register.2}}"><a href="{{$nav.register.0}}" title="{{$nav.register.3}}" id="{{$nav.register.4}}">{{$nav.register.1}}</a></li>{{/if}} + {{if !$userinfo}} {{if $nav.loginmenu}} - <li class="{{$nav.loginmenu.0.2}} hidden-xs"> - <a data-toggle="dropdown" data-target="#" href="{{$nav.loginmenu.0.0}}" title="{{$nav.loginmenu.0.3}}" id="{{$nav.loginmenu.0.4}}">{{$nav.loginmenu.0.1}} <span class="caret" id="loginmenu-caret"></span></a> - <ul class="dropdown-menu" role="menu"> - {{foreach $nav.loginmenu as $loginmenu}} - <li role="presentation"><a class="{{$loginmenu.2}}" href="{{$loginmenu.0}}" title="{{$loginmenu.3}}" role="menuitem" id="{{$loginmenu.4}}">{{$loginmenu.1}}</a></li> - {{/foreach}} - </ul> - </li> - {{foreach $nav.loginmenu as $loginmenu}} - <li role="presentation"><a class="{{$loginmenu.2}} visible-xs" href="{{$loginmenu.0}}" title="{{$loginmenu.3}}" role="menuitem">{{$loginmenu.1}}</a></li> - {{/foreach}} + <li class="{{$nav.loginmenu.0.2}} hidden-xs"> + <a data-toggle="dropdown" data-target="#" href="{{$nav.loginmenu.0.0}}" title="{{$nav.loginmenu.0.3}}" id="{{$nav.loginmenu.0.4}}">{{$nav.loginmenu.0.1}} <span class="caret" id="loginmenu-caret"></span></a> + <ul class="dropdown-menu" role="menu"> + {{foreach $nav.loginmenu as $loginmenu}} + <li role="presentation"><a class="{{$loginmenu.2}}" href="{{$loginmenu.0}}" title="{{$loginmenu.3}}" role="menuitem" id="{{$loginmenu.4}}">{{$loginmenu.1}}</a></li> + {{/foreach}} + </ul> + </li> + {{foreach $nav.loginmenu as $loginmenu}} + <li role="presentation"><a class="{{$loginmenu.2}} visible-xs" href="{{$loginmenu.0}}" title="{{$loginmenu.3}}" role="menuitem">{{$loginmenu.1}}</a></li> + {{/foreach}} + {{/if}} + {{/if}} + + {{if $nav.alogout}}<li class="{{$nav}}-alogout.2"><a href="{{$nav.alogout.0}}" title="{{$nav.alogout.3}}" id="{{$nav.alogout.4}}">{{$nav.alogout.1}}</a></li>{{/if}} + + {{if $nav.network}} + <li class="{{$sel.network}} hidden-xs"> + <a href="{{$nav.network.0}}" title="{{$nav.network.3}}" id="{{$nav.network.4}}"><i class="icon-th"></i></a> + <span class="net-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-network-menu"></span> + <ul id="nav-network-menu" role="menu" class="dropdown-menu" rel="network"> + {{* <li id="nav-network-see-all"><a href="{{$nav.network.all.0}}">{{$nav.network.all.1}}</a></li> *}} + <li id="nav-network-mark-all"><a href="#" onclick="markRead('network'); return false;">{{$nav.network.mark.1}}</a></li> + <li class="empty">{{$emptynotifications}}</li> + </ul> + </li> + <li class="{{$sel.network}} visible-xs"> + <a href="{{$nav.network.0}}" title="{{$nav.network.3}}" ><i class="icon-th"></i></a> + <span class="net-update badge" rel="#nav-network-menu"></span> + </li> + {{/if}} + + {{if $nav.home}} + <li class="{{$sel.home}} hidden-xs"> + <a class="{{$nav.home.2}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" id="{{$nav.home.4}}"><i class="icon-home"></i></a> + <span class="home-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-home-menu"></span> + <ul id="nav-home-menu" class="dropdown-menu" rel="home"> + {{* <li id="nav-home-see-all"><a href="{{$nav.home.all.0}}">{{$nav.home.all.1}}</a></li> *}} + <li id="nav-home-mark-all"><a href="#" onclick="markRead('home'); return false;">{{$nav.home.mark.1}}</a></li> + <li class="empty">{{$emptynotifications}}</li> + </ul> + </li> + <li class="{{$sel.home}} visible-xs"> + <a class="{{$nav.home.2}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" ><i class="icon-home"></i></a> + <span class="home-update badge" rel="#nav-home-menu"></span> + </li> + {{/if}} + + + {{if $nav.messages}} + <li class="{{$sel.messages}} hidden-xs"> + <a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" id="{{$nav.messages.4}}"><i class="icon-envelope"></i></a> + <span class="mail-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-messages-menu"></span> + <ul id="nav-messages-menu" class="dropdown-menu" rel="messages"> + <li id="nav-messages-see-all"><a href="{{$nav.messages.all.0}}">{{$nav.messages.all.1}}</a></li> + <li id="nav-messages-mark-all"><a href="#" onclick="markRead('messages'); return false;">{{$nav.messages.mark.1}}</a></li> + <li class="empty">{{$emptynotifications}}</li> + </ul> + </li> + <li class="{{$sel.messages}} visible-xs"> + <a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" ><i class="icon-envelope"></i></a> + <span class="mail-update badge" rel="#nav-messages-menu"></span> + </li> + {{/if}} + + {{if $nav.all_events}} + <li class="{{$sel.all_events}} hidden-xs"> + <a class="{{$nav.all_events.2}}" href="{{$nav.all_events.0}}" title="{{$nav.all_events.3}}" id='{{$nav.all_events.4}}'><i class="icon-calendar"></i></a> + <span class="all_events-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-all_events-menu"></span> + <ul id="nav-all_events-menu" class="dropdown-menu" rel="all_events"> + <li id="nav-all_events-see-all"><a href="{{$nav.all_events.all.0}}">{{$nav.all_events.all.1}}</a></li> + <li id="nav-all_events-mark-all"><a href="#" onclick="markRead('all_events'); return false;">{{$nav.all_events.mark.1}}</a></li> + <li class="empty">{{$emptynotifications}}</li> + </ul> + </li> + <li class="{{$sel.all_events}} visible-xs"> + <a class="{{$nav.all_events.2}}" href="{{$nav.all_events.0}}" title="{{$nav.all_events.3}}" ><i class="icon-calendar"></i></a> + <span class="all_events-update badge" rel="#nav-all_events-menu"></span> + </li> + {{/if}} + + {{if $nav.intros}} + <li class="{{$sel.intros}} hidden-xs"> + <a class="{{$nav.intros.2}}" href="{{$nav.intros.0}}" title="{{$nav.intros.3}}" id="{{$nav.intros.4}}"><i class="icon-user"></i></a> + <span class="intro-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-intros-menu"></span> + <ul id="nav-intros-menu" class="dropdown-menu" rel="intros"> + <li id="nav-intros-see-all"><a href="{{$nav.intros.all.0}}">{{$nav.intros.all.1}}</a></li> + <li class="empty">{{$emptynotifications}}</li> + </ul> + </li> + <li class="{{$sel.intros}} visible-xs"> + <a class="{{$nav.intros.2}}" href="{{$nav.intros.0}}" title="{{$nav.intros.3}}" ><i class="icon-user"></i></a> + <span class="intro-update badge" rel="#nav-intros-menu"></span> + </li> + {{/if}} + + {{if $nav.notifications}} + <li class="{{$sel.notifications}} hidden-xs"> + <a href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}" id="{{$nav.notifications.4}}"><i class="icon-exclamation"></i></a> + <span class="notify-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-notify-menu"></span> + <ul id="nav-notify-menu" class="dropdown-menu" rel="notify"> + <li id="nav-notify-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li> + <li id="nav-notify-mark-all"><a href="#" onclick="markRead('notify'); return false;">{{$nav.notifications.mark.1}}</a></li> + <li class="empty">{{$emptynotifications}}</li> + </ul> + </li> + <li class="{{$sel.notifications}} visible-xs"> + <a href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}"><i class="icon-exclamation"></i></a> + <span class="notify-update badge" rel="#nav-notify-menu"></span> + </li> {{/if}} - {{/if}} - {{if $nav.alogout}}<li class="{{$nav}}-alogout.2"><a href="{{$nav.alogout.0}}" title="{{$nav.alogout.3}}" id="{{$nav.alogout.4}}">{{$nav.alogout.1}}</a></li>{{/if}} - {{if $nav.network}} - <li class="{{$sel.network}} hidden-xs"> - <a href="{{$nav.network.0}}" title="{{$nav.network.3}}" id="{{$nav.network.4}}"><i class="icon-th"></i></a> - <span class="net-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-network-menu"></span> - <ul id="nav-network-menu" role="menu" class="dropdown-menu" rel="network"> - {{* <li id="nav-network-see-all"><a href="{{$nav.network.all.0}}">{{$nav.network.all.1}}</a></li> *}} - <li id="nav-network-mark-all"><a href="#" onclick="markRead('network'); return false;">{{$nav.network.mark.1}}</a></li> - <li class="empty">{{$emptynotifications}}</li> - </ul> - </li> - <li class="{{$sel.network}} visible-xs"> - <a href="{{$nav.network.0}}" title="{{$nav.network.3}}" ><i class="icon-th"></i></a> - <span class="net-update badge" rel="#nav-network-menu"></span> - </li> - {{/if}} - {{if $nav.home}} - <li class="{{$sel.home}} hidden-xs"> - <a class="{{$nav.home.2}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" id="{{$nav.home.4}}"><i class="icon-home"></i></a> - <span class="home-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-home-menu"></span> - <ul id="nav-home-menu" class="dropdown-menu" rel="home"> - {{* <li id="nav-home-see-all"><a href="{{$nav.home.all.0}}">{{$nav.home.all.1}}</a></li> *}} - <li id="nav-home-mark-all"><a href="#" onclick="markRead('home'); return false;">{{$nav.home.mark.1}}</a></li> - <li class="empty">{{$emptynotifications}}</li> - </ul> - </li> - <li class="{{$sel.home}} visible-xs"> - <a class="{{$nav.home.2}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" ><i class="icon-home"></i></a> - <span class="home-update badge" rel="#nav-home-menu"></span> - </li> - {{/if}} - {{if $nav.messages}} - <li class="{{$sel.messages}} hidden-xs"> - <a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" id="{{$nav.messages.4}}"><i class="icon-envelope"></i></a> - <span class="mail-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-messages-menu"></span> - <ul id="nav-messages-menu" class="dropdown-menu" rel="messages"> - <li id="nav-messages-see-all"><a href="{{$nav.messages.all.0}}">{{$nav.messages.all.1}}</a></li> - <li id="nav-messages-mark-all"><a href="#" onclick="markRead('messages'); return false;">{{$nav.messages.mark.1}}</a></li> - <li class="empty">{{$emptynotifications}}</li> - </ul> - </li> - <li class="{{$sel.messages}} visible-xs"> - <a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" ><i class="icon-envelope"></i></a> - <span class="mail-update badge" rel="#nav-messages-menu"></span> - </li> - {{/if}} - {{if $nav.all_events}} - <li class="{{$sel.all_events}} hidden-xs"> - <a class="{{$nav.all_events.2}}" href="{{$nav.all_events.0}}" title="{{$nav.all_events.3}}" id='{{$nav.all_events.4}}'><i class="icon-calendar"></i></a> - <span class="all_events-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-all_events-menu"></span> - <ul id="nav-all_events-menu" class="dropdown-menu" rel="all_events"> - <li id="nav-all_events-see-all"><a href="{{$nav.all_events.all.0}}">{{$nav.all_events.all.1}}</a></li> - <li id="nav-all_events-mark-all"><a href="#" onclick="markRead('all_events'); return false;">{{$nav.all_events.mark.1}}</a></li> - <li class="empty">{{$emptynotifications}}</li> - </ul> - </li> - <li class="{{$sel.all_events}} visible-xs"> - <a class="{{$nav.all_events.2}}" href="{{$nav.all_events.0}}" title="{{$nav.all_events.3}}" ><i class="icon-calendar"></i></a> - <span class="all_events-update badge" rel="#nav-all_events-menu"></span> - </li> - {{/if}} - {{if $nav.intros}} - <li class="{{$sel.intros}} hidden-xs"> - <a class="{{$nav.intros.2}}" href="{{$nav.intros.0}}" title="{{$nav.intros.3}}" id="{{$nav.intros.4}}"><i class="icon-user"></i></a> - <span class="intro-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-intros-menu"></span> - <ul id="nav-intros-menu" class="dropdown-menu" rel="intros"> - <li id="nav-intros-see-all"><a href="{{$nav.intros.all.0}}">{{$nav.intros.all.1}}</a></li> - <li class="empty">{{$emptynotifications}}</li> - </ul> - </li> - <li class="{{$sel.intros}} visible-xs"> - <a class="{{$nav.intros.2}}" href="{{$nav.intros.0}}" title="{{$nav.intros.3}}" ><i class="icon-user"></i></a> - <span class="intro-update badge" rel="#nav-intros-menu"></span> - </li> - {{/if}} - {{if $nav.notifications}} - <li class="{{$sel.notifications}} hidden-xs"> - <a href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}" id="{{$nav.notifications.4}}"><i class="icon-exclamation"></i></a> - <span class="notify-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-notify-menu"></span> - <ul id="nav-notify-menu" class="dropdown-menu" rel="notify"> - <li id="nav-notify-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li> - <li id="nav-notify-mark-all"><a href="#" onclick="markRead('notify'); return false;">{{$nav.notifications.mark.1}}</a></li> - <li class="empty">{{$emptynotifications}}</li> - </ul> - </li> - <li class="{{$sel.notifications}} visible-xs"> - <a href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}"><i class="icon-exclamation"></i></a> - <span class="notify-update badge" rel="#nav-notify-menu"></span> - </li> - {{/if}} - </ul> - <ul class="nav navbar-nav navbar-right"> - <li class="hidden-xs"> - <form method="get" action="search" role="search"> - <div id="nav-search-spinner"></div><input class="icon-search" id="nav-search-text" type="text" value="" placeholder=" {{$help}}" name="search" title="{{$nav.search.3}}" onclick="this.submit();"/> - </form> - </li> - <li class="visible-xs"> - <a href="/search" title="{{$nav.search.3}}"><i class="icon-search"></i></a> - </li> + </ul> + <ul class="nav navbar-nav navbar-right"> + <li class="hidden-xs"> + <form method="get" action="search" role="search"> + <div id="nav-search-spinner"></div><input class="icon-search" id="nav-search-text" type="text" value="" placeholder=" {{$help}}" name="search" title="{{$nav.search.3}}" onclick="this.submit();"/> + </form> + </li> + <li class="visible-xs"> + <a href="/search" title="{{$nav.search.3}}"><i class="icon-search"></i></a> + </li> + {{if $powered_by}} - <div id="powered-by">{{$powered_by}}</div> + <div id="powered-by">{{$powered_by}}</div> {{/if}} {{if $nav.directory}} - <li class="{{$sel.directory}}"> - <a class="{{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" id="{{$nav.directory.4}}"><i class="icon-sitemap"></i></a> - </li> + <li class="{{$sel.directory}}"> + <a class="{{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" id="{{$nav.directory.4}}"><i class="icon-sitemap"></i></a> + </li> {{/if}} + {{if $nav.apps}} - <li class="{{$sel.apps}}"> - <a class="{{$nav.apps.2}}" href="{{$nav.apps.0}}" title="{{$nav.apps.3}}" id="{{$nav.apps.4}}"><i class="icon-cogs"></i></a> - </li> + <li class="{{$sel.apps}}"> + <a class="{{$nav.apps.2}}" href="{{$nav.apps.0}}" title="{{$nav.apps.3}}" id="{{$nav.apps.4}}"><i class="icon-cogs"></i></a> + </li> {{/if}} + {{if $nav.help}} - <li class="{{$sel.help}} hidden-xs"> - <a class="{{$nav.help.2}}" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" id="{{$nav.help.4}}" onclick="$('#help-content').toggleClass('help-content-open'); return false;"><i class="icon-question"></i></a> - </li> + <li class="{{$sel.help}}{{if $nav.help.6}} hidden-xs{{/if}}"> + <a class="{{$nav.help.2}}" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" id="{{$nav.help.4}}"{{if $nav.help.6}} onclick="contextualHelp(); return false;"{{/if}}>{{if $nav.help.6}}<i class="icon-question-sign"></i>{{else}}<i class="icon-question"></i>{{/if}}</a> + </li> {{/if}} - </ul> + </ul> + </div> </div> - <div id="help-content" class="help-content"> + {{if $nav.help.6}} + <div id="contextual-help-content" class="contextual-help-content"> {{$nav.help.5}} - <p class="pull-right"><a href="{{$nav.help.0}}">Click here for more documentation...</a></p> + <div class="pull-right"> + <a class="contextual-help-tool" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}"><i class="icon-question"></i></a> + <a class="contextual-help-tool" href="#" onclick="contextualHelp(); return false;"><i class="icon-remove"></i></a> + </div> </div> -</div> + {{/if}} diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index 254733622..ca2b5e090 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -5,7 +5,7 @@ {{if $tools || $map || $edit}} <div class="btn-group"> <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown"> - <i class="icon-caret-down"></i> + <i class="icon-caret-down"></i> {{$tools_label}} </button> <ul class="dropdown-menu"> {{if $tools}} diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl index a02323e45..4908646b9 100755 --- a/view/tpl/profile_edit.tpl +++ b/view/tpl/profile_edit.tpl @@ -2,7 +2,7 @@ <div class="section-title-wrapper"> <div class="dropdown pull-right" id="profile-edit-links"> <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> - <i class="icon-caret-down"></i> + <i class="icon-caret-down"></i> {{$tools_label}} </button> <ul class="dropdown-menu"> <li class="nav-item"> diff --git a/view/tpl/rsd.tpl b/view/tpl/rsd.tpl new file mode 100644 index 000000000..9fd02c472 --- /dev/null +++ b/view/tpl/rsd.tpl @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<rsd version="1.0" xmlns="http://archipelago.phrasewise.com/rsd"> + <service> + <engineName>{{$project}}</engineName> + <engineLink>{{$baseurl}}</engineLink> + <apis> + <api name="Twitter" preferred="true" apiLink="{{$apipath}}" blogID=""> + <settings> + <docs>http://status.net/wiki/TwitterCompatibleAPI</docs> + <setting name="OAuth">true</setting> + </settings> + </api> + </apis> + </service> +</rsd>
\ No newline at end of file |