diff options
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/abook_edit.tpl | 1 | ||||
| -rwxr-xr-x | view/tpl/admin_site.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/blocklist.tpl | 18 | ||||
| -rw-r--r-- | view/tpl/bookmarkedchats.tpl | 10 | ||||
| -rwxr-xr-x | view/tpl/conv_item.tpl | 17 | ||||
| -rw-r--r-- | view/tpl/hdr.tpl | 7 | ||||
| -rw-r--r-- | view/tpl/help.tpl | 3 | ||||
| -rwxr-xr-x | view/tpl/jot.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/js_strings.tpl | 1 | ||||
| -rwxr-xr-x | view/tpl/lang_selector.tpl | 5 | ||||
| -rw-r--r-- | view/tpl/layoutlist.tpl | 19 | ||||
| -rwxr-xr-x | view/tpl/nav.tpl | 33 | ||||
| -rw-r--r-- | view/tpl/pdledit.tpl | 21 | ||||
| -rwxr-xr-x | view/tpl/peoplefind.tpl | 10 | ||||
| -rwxr-xr-x | view/tpl/photos_upload.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/profile_vcard.tpl | 6 | ||||
| -rwxr-xr-x | view/tpl/settings_display.tpl | 4 | ||||
| -rw-r--r-- | view/tpl/usermenu.tpl | 2 |
18 files changed, 121 insertions, 42 deletions
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl index 274d0d5de..b7a02c15e 100755 --- a/view/tpl/abook_edit.tpl +++ b/view/tpl/abook_edit.tpl @@ -34,6 +34,7 @@ <input type="hidden" name="contact_id" value="{{$contact_id}}"> <input id="contact-closeness-mirror" type="hidden" name="closeness" value="{{$close}}" /> +<div class="abook-permschange" style="display: none;"></div> {{if $is_pending}} <div class="abook-pending-contact"> diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index 9b90fb4b0..3e3b826f0 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -64,8 +64,6 @@ {{include file="field_input.tpl" field=$maximagesize}} <h3>{{$corporate}}</h3> - {{include file="field_input.tpl" field=$allowed_sites}} - {{include file="field_input.tpl" field=$allowed_email}} {{include file="field_checkbox.tpl" field=$block_public}} {{include file="field_checkbox.tpl" field=$force_publish}} diff --git a/view/tpl/blocklist.tpl b/view/tpl/blocklist.tpl new file mode 100644 index 000000000..adf61f788 --- /dev/null +++ b/view/tpl/blocklist.tpl @@ -0,0 +1,18 @@ +{{if $pages}} + + <div id="pagelist-content-wrapper" class="generic-content-wrapper"> + {{foreach $pages as $key => $items}} + {{foreach $items as $item}} + <div class="page-list-item"> + {{if $edit}}<a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="icon-pencil design-icons design-edit-icon"></i></a> {{/if}} + {{if $view}}<a href="block/{{$channel}}/{{$item.title}}" title="{{$view}}"><i class="icon-external-link design-icons design-view-icon"></i></a> {{/if}} + {{if $preview}}<a href="block/{{$channel}}/{{$item.title}}?iframe=true&width=80%&height=80%" title="{{$preview}}" class="webpage-preview" ><i class="icon-eye-open design-icons design-preview-icon"></i></a> {{/if}} + {{$item.title}} + </div> + {{/foreach}} + {{/foreach}} + </div> + + <div class="clear"></div> + +{{/if}} diff --git a/view/tpl/bookmarkedchats.tpl b/view/tpl/bookmarkedchats.tpl new file mode 100644 index 000000000..7635bb826 --- /dev/null +++ b/view/tpl/bookmarkedchats.tpl @@ -0,0 +1,10 @@ +{{if $rooms}} +<div class="widget"> +<h3>{{$header}}</h3> +<ul class="bookmarkchat"> +{{foreach $rooms as $room}} +<li><a href="{{$room.xchat_url}}">{{$room.xchat_desc}}</a></li> +{{/foreach}} +</ul> +</div> +{{/if}}
\ No newline at end of file diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 869692bfa..8d59951e7 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -9,18 +9,20 @@ <div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-outside-wrapper-{{$item.id}}" > <div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" > <div class="wall-item-info{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-info-{{$item.id}}"> + {{* comment out for now. let's see if somebody is missing it. if yes we need a better visual concept. {{if $item.owner_url}} <div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-{{$item.id}}" > <a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-photo-link" id="wall-item-ownerphoto-link-{{$item.id}}"> - <img src="{{$item.owner_photo}}" class="wall-item-photo{{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.owner_name}}" /></a> + <img src="{{$item.owner_photo}}" class="wall-item-photo{{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" alt="{{$item.owner_name}}" /></a> </div> <div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="{{$item.wall}}" /></div> {{/if}} + *}} <div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}" onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')" onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)"> <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}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a> + <img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" /></a> <span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span> <div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}"> <ul> @@ -30,16 +32,11 @@ </div> <div class="wall-item-photo-end"></div> - <div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" > - {{if $item.lock}}<i class="wall-item-lock icon-lock lockview" title="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" ></i> - {{else}}<div class="wall-item-lock"></div>{{/if}} - <div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}</div> - </div> + </div> <div class="wall-item-author"> - <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}} {{$item.via}} <a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}}<br /> - - <div class="wall-item-ago" id="wall-item-ago-{{$item.id}}">{{if $item.verified}}<i class="icon-ok" title="{{$item.verified}}"></i> {{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}</span>{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}</div> + {{if $item.lock}}<i class="wall-item-lock icon-lock lockview" title="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" ></i> {{/if}}<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}} {{$item.via}} <a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}}<br /> + <div class="wall-item-ago" id="wall-item-ago-{{$item.id}}">{{if $item.verified}}<i class="icon-ok" title="{{$item.verified}}"></i> {{/if}}{{if $item.location}}<span class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}, </span>{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}</span>{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}</div> </div> <div class="wall-item-content" id="wall-item-content-{{$item.id}}" > <div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div> diff --git a/view/tpl/hdr.tpl b/view/tpl/hdr.tpl new file mode 100644 index 000000000..f1e78b897 --- /dev/null +++ b/view/tpl/hdr.tpl @@ -0,0 +1,7 @@ +<div id="banner" class="hidden-sm hidden-xs">{{$banner}}</div> + +<ul id="nav-notifications-template" style="display:none;" rel="template"> + <li class="{5}"><a href="{0}" title="{2} {3}"><img src="{1}"><span class='contactname'>{2}</span>{3}<br><span class="notif-when">{4}</span></a></li> +</ul> + +<div id="panel" style="display: none;"></div> diff --git a/view/tpl/help.tpl b/view/tpl/help.tpl new file mode 100644 index 000000000..e01243077 --- /dev/null +++ b/view/tpl/help.tpl @@ -0,0 +1,3 @@ +<div id = "help-content" class="generic-content-wrapper"> +{{$content}} +</div> diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index e1e1e3080..4cc9c0d10 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -23,7 +23,7 @@ <div id="jot-pagetitle-wrap"><input name="pagetitle" id="jot-pagetitle" type="text" placeholder="{{$placeholdpagetitle}}" value="{{$pagetitle}}" class="jothidden" style="display:none" /></div> {{/if}} <div id="jot-text-wrap"> - <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" placeholder="{{$share}}">{{$content}}</textarea> + <textarea class="profile-jot-text" id="profile-jot-text" name="body" placeholder="{{$share}}">{{$content}}</textarea> </div> <div id="profile-jot-text-loading"></div> diff --git a/view/tpl/js_strings.tpl b/view/tpl/js_strings.tpl index fe5228ee9..cac5be65b 100755 --- a/view/tpl/js_strings.tpl +++ b/view/tpl/js_strings.tpl @@ -13,6 +13,7 @@ 'everybody' : "{{$everybody}}", 'passphrase' : "{{$passphrase}}", 'passhint' : "{{$passhint}}", + 'permschange' : "{{$permschange}}", 't01' : "{{$t01}}", 't02' : "{{$t02}}", diff --git a/view/tpl/lang_selector.tpl b/view/tpl/lang_selector.tpl index 159eeea7e..b512c759b 100755 --- a/view/tpl/lang_selector.tpl +++ b/view/tpl/lang_selector.tpl @@ -1,5 +1,6 @@ -<div id="lang-select-icon" title="{{$title}}" onclick="openClose('language-selector');" ><i class="icon-flag"></i></div> -<div id="language-selector" style="display: none;" > +<h1>{{$title}}</h1> +<br /> +<div id="language-selector" > <form action="#" method="post" > <select name="system_language" onchange="this.form.submit();" > {{foreach $langs.0 as $v=>$l}} diff --git a/view/tpl/layoutlist.tpl b/view/tpl/layoutlist.tpl new file mode 100644 index 000000000..96c692c1c --- /dev/null +++ b/view/tpl/layoutlist.tpl @@ -0,0 +1,19 @@ +{{if $pages}} + + <div id="pagelist-content-wrapper" class="generic-content-wrapper"> + {{foreach $pages as $key => $items}} + {{foreach $items as $item}} + <div class="page-list-item"> + {{if $edit}}<a href="{{$baseurl}}/{{$item.url}}" title="{{$edit}}"><i class="icon-pencil design-icons design-edit-icon"></i></a> {{/if}} + {{if $view}}<a href="page/{{$channel}}/{{$item.title}}" title="{{$view}}"><i class="icon-external-link design-icons design-view-icon"></i></a> {{/if}} + {{if $share}}<a href="layouts/{{$channel}}/share/{{$item.mid}}" title="{{$share}}"><i class="icon-share design-icons"></i></a> {{/if}} + {{if $preview}}<a href="page/{{$channel}}/{{$item.title}}?iframe=true&width=80%&height=80%" title="{{$preview}}" class="webpage-preview" ><i class="icon-eye-open design-icons design-preview-icon"></i></a> {{/if}} + {{$item.title}} + </div> + {{/foreach}} + {{/foreach}} + </div> + + <div class="clear"></div> + +{{/if}} diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 20600ccd7..fbdf28f76 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -1,9 +1,3 @@ -<header> -<!-- <div id="site-location">{{$sitelocation}}</div> --> - <div id="banner" class="hidden-sm hidden-xs">{{$banner}}</div> -</header> - -<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation"> <div class="container-fluid"> <div class="navbar-header"> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-1"> @@ -11,8 +5,11 @@ <span class="icon-bar"></span> <span class="icon-bar"></span> </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 $userinfo}} - <img class="dropdown-toggle fakelink" data-toggle="dropdown" id="avatar" src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"><span class="caret"></span> + <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}} @@ -35,10 +32,14 @@ <ul class="nav navbar-nav navbar-left"> {{if $nav.lock}} <li> - <a class="fakelink" title="{{$nav.lock.3}}" onclick="window.location.href='{{$nav.lock.0}}'; return false;"><i class="{{if $nav.locked}}icon-lock{{else}}icon-unlock{{/if}}"></i></a> + <a title="{{$nav.lock.3}}" href="{{$nav.lock.0}}"><i class="{{if $nav.locked}}icon-lock{{else}}icon-unlock{{/if}}"></i></a> </li> {{/if}} + {{if $nav.login}}<li class="{{$nav.login.2}}"><a href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a><li>{{/if}} + + {{if $nav.alogout}}<li class="{{$nav}}-alogout.2"><a href="{{$nav.alogout.0}}" title="{{$nav.alogout.3}}" >{{$nav.alogout.1}}</a></li>{{/if}} + {{if $nav.network}} <li class="{{$sel.network}} hidden-xs"> <a href="{{$nav.network.0}}" title="{{$nav.network.3}}" ><i class="icon-th"></i></a> @@ -143,13 +144,9 @@ </form> </li> <li class="visible-xs"> - <a href="/search" title="Search"><i class="icon-search"></i></a> + <a href="/search" title="{{$nav.search.3}}"><i class="icon-search"></i></a> </li> - {{if $nav.login}}<li class="{{$nav.login.2}}"><a href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a><li>{{/if}} - - {{if $nav.alogout}}<li class="{{$nav}}-alogout.2"><a href="{{$nav.alogout.0}}" title="{{$nav.alogout.3}}" >{{$nav.alogout.1}}</a></li>{{/if}} - {{if $nav.directory}} <li class="{{$sel.directory}}"> <a class="{{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}"><i class="icon-sitemap"></i></a> @@ -161,7 +158,7 @@ <a class="{{$nav.apps.2}} dropdown-toggle" data-toggle="dropdown" href="#" rel="#nav-apps-menu" title="{{$nav.apps.3}}" ><i class="icon-cogs"></i></a> <ul class="dropdown-menu"> {{foreach $apps as $ap}} - <li>{{$ap}}</li> + <li role="presentation">{{$ap}}</li> {{/foreach}} </ul> </li> @@ -169,17 +166,11 @@ {{if $nav.help}} <li class="{{$sel.help}}"> - <a class="{{$nav.help.2}}" target="friendika-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" ><i class="icon-question"></i></a> + <a class="{{$nav.help.2}}" target="redmatrix-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" ><i class="icon-question"></i></a> </li> {{/if}} </ul> </div> </div> -</nav> -<ul id="nav-notifications-template" style="display:none;" rel="template"> - <li class="{5}"><a href="{0}" title="{2} {3}"><img src="{1}"><span class='contactname'>{2}</span>{3}<br><span class="notif-when">{4}</span></a></li> -</ul> -{{if $langselector}}<div id="langselector" >{{$langselector}}</div>{{/if}} -<div id="panel" style="display: none;"></div> diff --git a/view/tpl/pdledit.tpl b/view/tpl/pdledit.tpl new file mode 100644 index 000000000..ef8ff8dce --- /dev/null +++ b/view/tpl/pdledit.tpl @@ -0,0 +1,21 @@ +<h1>{{$header}}</h1> + +<h2>{{$mname}} {{$module}}</h2> + +<br /> +<a href="help/Comanche" target="redmatrix-help">{{$help}}</a> +<br /> +<br /> + + + +<form action="pdledit" method="post" > +<input type="hidden" name="module" value="{{$module}}" /> +<textarea rows="24" cols="80" name="content">{{$content}}</textarea> + +<br /> +<input type="submit" name="submit" value="{{$submit}}" /> + +</form> + + diff --git a/view/tpl/peoplefind.tpl b/view/tpl/peoplefind.tpl index 45b3d7d4b..c1462a9e9 100755 --- a/view/tpl/peoplefind.tpl +++ b/view/tpl/peoplefind.tpl @@ -4,8 +4,16 @@ <form action="directory" method="post" /> <input class="icon-search" id="side-peoplefind-url" type="text" name="search" size="24" title="{{$hint}}" placeholder=""/> <input id="side-peoplefind-submit" type="submit" name="submit" value="{{$findthem}}" /> + <br /> + {{if $advanced_search}} + <a href="#" onclick="openClose('advanced-people-search-div'); return false;">{{$advanced_search}}</a> + <div id="advanced-people-search-div" style="display: none;"> + <input class="icon-search" id="side-peoplefind-url" type="text" name="query" size="24" title="{{$advanced_hint}}" placeholder=""/> + <input id="side-peoplefind-submit" type="submit" name="submit" value="{{$find_advanced}}" /> + </div> + <br /> + {{/if}} </form> - <br /> {{if $similar}}<a href="match" >{{$similar}}</a><br />{{/if}} {{if $loggedin}}<a href="suggest" >{{$suggest}}</a><br />{{/if}} <a href="randprof" >{{$random}}</a><br /> diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl index 102c4d872..3f1906086 100755 --- a/view/tpl/photos_upload.tpl +++ b/view/tpl/photos_upload.tpl @@ -24,7 +24,7 @@ <div id="photos-upload-perms" class="photos-upload-perms" > - <a href="#photos-upload-permissions-wrapper" id="photos-upload-perms-menu" class="button popupbox" /> + <a href="#photos-upload-permissions-wrapper" id="photos-upload-perms-menu" class="button" /> <span id="jot-perms-icon" class="icon {{$lockstate}}" ></span>{{$permissions}} </a> </div> diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl index 10a928e1c..10a0a25a9 100755 --- a/view/tpl/profile_vcard.tpl +++ b/view/tpl/profile_vcard.tpl @@ -1,9 +1,9 @@ <div class="vcard"> {{if $profile.edit}} - <div class="action"> - <a class="profile-edit-side-link dropdown-toggle" data-toggle="dropdown" rel="#profiles-menu" title="{{$profile.edit.3}}" href="#" ><i class="icon-pencil vcard-profile-edit-icon" title="{{$profile.edit.1}}" ></i></a> - <ul id="profiles-menu" class="menu-popup dropdown-menu"> + <div class="dropdown"> + <a class="profile-edit-side-link dropdown-toggle" data-toggle="dropdown" title="{{$profile.edit.3}}" href="#" ><i class="icon-pencil" title="{{$profile.edit.1}}" ></i></a> + <ul class="dropdown-menu" role="menu"> {{foreach $profile.menu.entries as $e}} <li> <a href="profiles/{{$e.id}}"><img src='{{$e.photo}}'>{{$e.profile_name}}</a> diff --git a/view/tpl/settings_display.tpl b/view/tpl/settings_display.tpl index a8fb002fb..924b4b33f 100755 --- a/view/tpl/settings_display.tpl +++ b/view/tpl/settings_display.tpl @@ -16,6 +16,10 @@ <input type="submit" name="submit" class="settings-submit" value="{{$submit}}" /> </div> +<br /> +<a href="pdledit">{{$layout_editor}}</a> +<br /> + {{if $theme_config}} <h2>Theme settings</h2> {{$theme_config}} diff --git a/view/tpl/usermenu.tpl b/view/tpl/usermenu.tpl index 80e160fdf..a5c6faa99 100644 --- a/view/tpl/usermenu.tpl +++ b/view/tpl/usermenu.tpl @@ -1,4 +1,4 @@ -<div class="pmenu"> +<div class="pmenu{{if $class}} {{$class}}{{/if}}"> {{if $menu.menu_desc}} <h3 class="pmenu-title">{{$menu.menu_desc}}</h3> {{/if}} |