diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/css/mod_connect.css | 11 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 4 | ||||
| -rw-r--r-- | view/theme/redbasic/php/theme.php | 6 | ||||
| -rwxr-xr-x | view/tpl/admin_site.tpl | 8 | ||||
| -rwxr-xr-x | view/tpl/direntry.tpl | 23 | ||||
| -rwxr-xr-x | view/tpl/jot.tpl | 3 | ||||
| -rwxr-xr-x | view/tpl/mail_display.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/mail_list.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/page_display.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/profile_advanced.tpl | 3 | ||||
| -rw-r--r-- | view/tpl/sellpage_edit.tpl | 23 | ||||
| -rw-r--r-- | view/tpl/sellpage_submit.tpl | 3 | ||||
| -rw-r--r-- | view/tpl/sellpage_view.tpl | 11 | ||||
| -rwxr-xr-x | view/tpl/settings.tpl | 6 | ||||
| -rwxr-xr-x | view/tpl/threaded_conversation.tpl | 3 | ||||
| -rw-r--r-- | view/tpl/webpagelist.tpl | 2 |
16 files changed, 85 insertions, 27 deletions
diff --git a/view/css/mod_connect.css b/view/css/mod_connect.css new file mode 100644 index 000000000..d1a46ec48 --- /dev/null +++ b/view/css/mod_connect.css @@ -0,0 +1,11 @@ +.sellpage-body { + margin-top: 25px; +} + +.sellpage-final { + margin-top: 25px; +} + +#sellpage-edit label{ + width: 300px; +}
\ No newline at end of file diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index f4c399735..4d0f6bbcf 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -331,6 +331,8 @@ ul.tabs { /* footer */ footer { + position:fixed; + bottom:1px; text-align: right; padding-bottom: 1em; padding-right: 3em; @@ -3493,7 +3495,7 @@ ul.menu-popup { .shared_header img { margin-right: 10px; } -.mail-list-wrapper { +#mail-list-wrapper { border-bottom: 1px solid #ccc; padding: 20px; diff --git a/view/theme/redbasic/php/theme.php b/view/theme/redbasic/php/theme.php index 3d69a7e22..ca280ef6a 100644 --- a/view/theme/redbasic/php/theme.php +++ b/view/theme/redbasic/php/theme.php @@ -1,9 +1,5 @@ <?php function redbasic_init(&$a) { - if($a->config['system']['theme_engine']) - $a->set_template_engine($a->config['system']['theme_engine']); - else - $a->set_template_engine('smarty3'); -// head_add_js('redbasic.js'); + } diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index 76dae6ea1..32c5db8fc 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -44,10 +44,10 @@ {{include file="field_textarea.tpl" field=$banner}} {{include file="field_select.tpl" field=$language}} {{include file="field_select.tpl" field=$theme}} - {{include file="field_select.tpl" field=$theme_mobile}} - {{include file="field_select.tpl" field=$theme_accessibility}} - {{include file="field_input.tpl" field=$site_channel}} - {{include file="field_select.tpl" field=$ssl_policy}} + {{include file="field_select.tpl" field=$theme_mobile}} + {{include file="field_select.tpl" field=$theme_accessibility}} + {{include file="field_input.tpl" field=$site_channel}} + <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div> diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl index c6c0ab028..35bbbe0fd 100755 --- a/view/tpl/direntry.tpl +++ b/view/tpl/direntry.tpl @@ -1,13 +1,16 @@ <div class="directory-item lframe" id="directory-item-{{$entry.id}}" > - <div class="contact-photo-wrapper" id="directory-photo-wrapper-{{$entry.id}}" > - <div class="contact-photo" id="directory-photo-{{$entry.id}}" > - <a href="{{$entry.profile_link}}" class="directory-profile-link" id="directory-profile-link-{{$entry.id}}" ><img class="directory-photo-img" src="{{$entry.photo}}" alt="{{$entry.alttext}}" title="{{$entry.alttext}}" /></a> - </div> - </div> +<div class="generic-content-wrapper"> - <div class="contact-name" id="directory-name-{{$entry.id}}">{{$entry.name}}</div> - {{if $entry.connect}} - <div class="directory-connect"><a href="{{$entry.connect}}">{{$entry.conn_label}}</a></div> - {{/if}} - <div class="contact-details">{{$entry.details}}</div> +<div class="contact-photo-wrapper" id="directory-photo-wrapper-{{$entry.id}}" > +<div class="contact-photo" id="directory-photo-{{$entry.id}}" > +<a href="{{$entry.profile_link}}" class="directory-profile-link" id="directory-profile-link-{{$entry.id}}" ><img class="directory-photo-img" src="{{$entry.photo}}" alt="{{$entry.alttext}}" title="{{$entry.alttext}}" /></a> +</div> +</div> + +<div class="contact-name" id="directory-name-{{$entry.id}}">{{$entry.name}}</div> +{{if $entry.connect}} +<div class="directory-connect"><a href="{{$entry.connect}}">{{$entry.conn_label}}</a></div> +{{/if}} +<div class="contact-details">{{$entry.details}}</div> +</div> </div> diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 8092a7047..e67caf3d2 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -9,6 +9,9 @@ <input type="hidden" name="post_id" value="{{$post_id}}" /> <input type="hidden" name="webpage" value="{{$webpage}}" /> <input type="hidden" name="preview" id="jot-preview" value="0" /> + + {{$mimeselect}} + <div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" value="{{$title}}" class="jothidden" style="display:none"></div> {{if $catsenabled}} <div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" class="jothidden" style="display:none" /></div> diff --git a/view/tpl/mail_display.tpl b/view/tpl/mail_display.tpl index 26e02529a..7280f1e84 100755 --- a/view/tpl/mail_display.tpl +++ b/view/tpl/mail_display.tpl @@ -1,3 +1,4 @@ +<div class="generic-content-wrapper"> {{foreach $mails as $mail}} {{include file="mail_conv.tpl"}} {{/foreach}} @@ -7,3 +8,4 @@ {{else}} {{$unknown_text}} {{/if}} +</div> diff --git a/view/tpl/mail_list.tpl b/view/tpl/mail_list.tpl index fc4af8ddd..a01396ae5 100755 --- a/view/tpl/mail_list.tpl +++ b/view/tpl/mail_list.tpl @@ -1,4 +1,4 @@ -<div class="mail-list-wrapper"> +<div class="generic-content-wrapper" id="mail-list-wrapper"> <span class="mail-delete"><a href="message/dropconv/{{$id}}" onclick="return confirmDelete();" title="{{$delete}}" class="icon drophide mail-list-delete delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></span> <a href="{{$from_url}}" class="mail-list-sender-url" ><img class="mail-list-sender-photo" src="{{$from_photo}}" alt="{{$from_name}}" /></a> <span class="mail-from">{{$from_name}}</span> diff --git a/view/tpl/page_display.tpl b/view/tpl/page_display.tpl index 7b4fdb96e..d8175bdd2 100755 --- a/view/tpl/page_display.tpl +++ b/view/tpl/page_display.tpl @@ -1,6 +1,6 @@ <div class="page"> -<div class="page-content-wrapper" id="page-content-wrapper" > +<div class="generic-content-wrapper" id="page-content-wrapper" > <h3 class="page-title">{{$title}}</h3> <div class="page-author"><a class=="page-author-link" href="{{$auth_url}}">{{$author}}</a></div> <div class="page-date">{{$date}}</div> diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl index db48a8509..9f17a0ffa 100755 --- a/view/tpl/profile_advanced.tpl +++ b/view/tpl/profile_advanced.tpl @@ -1,3 +1,4 @@ +<div id="profile-content-wrapper" class="generic-content-wrapper"> <h2>{{$title}}</h2> <dl id="aprofile-fullname" class="aprofile"> @@ -179,4 +180,4 @@ {{/foreach}} {{/if}} - +</div> diff --git a/view/tpl/sellpage_edit.tpl b/view/tpl/sellpage_edit.tpl new file mode 100644 index 000000000..0a4726fb2 --- /dev/null +++ b/view/tpl/sellpage_edit.tpl @@ -0,0 +1,23 @@ +<h1>{{$header}}</h1> +<form id="sellpage-edit" action="connect/{{$address}}" method="post"> + +{{include file="field_checkbox.tpl" field=$premium}} + +<div class="descriptive-text">{{$desc}}</div> + +<div class="sellpage-editbody"> +<p id="sellpage-bodydesc" > +{{$lbl_about}} +</p> + +<textarea rows="10" cols="72" id="sellpage-textinp" name="text" >{{$text}}</textarea> + +</div> +<div id="sellpage-editbody-end"></div> + + +<div class="descriptive-text">{{$lbl2}}</div> +<div class="sellpage-final">{{$desc2}}</div> + +<input type="submit" name="submit" value="{{$submit}}" /> +</form> diff --git a/view/tpl/sellpage_submit.tpl b/view/tpl/sellpage_submit.tpl new file mode 100644 index 000000000..2bd735ea4 --- /dev/null +++ b/view/tpl/sellpage_submit.tpl @@ -0,0 +1,3 @@ +<form id="sellpage-submit" action="connect/{{$address}}" method="post"> +<input type="submit" name="submit" value="{{$continue}}" /> +</form>
\ No newline at end of file diff --git a/view/tpl/sellpage_view.tpl b/view/tpl/sellpage_view.tpl new file mode 100644 index 000000000..20a65ffbe --- /dev/null +++ b/view/tpl/sellpage_view.tpl @@ -0,0 +1,11 @@ +<div class="generic-content-wrapper"> +<h1>{{$header}}</h1> + +<div class="descriptive-text">{{$desc}}</div> + +<div class="sellpage-body">{{$text}}</div> + +<div class="sellpage-final">{{$desc2}}</div> + +{{$submit}} +</div> diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index 194b90e80..0471546a6 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -100,9 +100,9 @@ <div id="settings-notifications"> <div id="settings-activity-desc">{{$activity_options}}</div> - -{{include file="field_checkbox.tpl" field=$post_newfriend}} -{{include file="field_checkbox.tpl" field=$post_joingroup}} +{{*the next two aren't yet implemented *}} +{{*include file="field_checkbox.tpl" field=$post_newfriend*}} +{{*include file="field_checkbox.tpl" field=$post_joingroup*}} {{include file="field_checkbox.tpl" field=$post_profilechange}} diff --git a/view/tpl/threaded_conversation.tpl b/view/tpl/threaded_conversation.tpl index 4bfcde896..2d71f01ab 100755 --- a/view/tpl/threaded_conversation.tpl +++ b/view/tpl/threaded_conversation.tpl @@ -1,3 +1,6 @@ +{{if $photo_item}} +{{$photo_item}} +{{/if}} {{foreach $threads as $thread_item}} {{include file="{{$thread_item.template}}" item=$thread_item}} {{/foreach}} diff --git a/view/tpl/webpagelist.tpl b/view/tpl/webpagelist.tpl index b09dc9f38..9a189230b 100644 --- a/view/tpl/webpagelist.tpl +++ b/view/tpl/webpagelist.tpl @@ -2,7 +2,7 @@ {{if $pages}} - <div id="pagelist-content-wrapper"> + <div id="pagelist-content-wrapper" class="generic-content-wrapper"> {{foreach $pages as $key => $items}} {{foreach $items as $item}} <div class="page-list-item"> |