diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/js/main.js | 9 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 17 | ||||
| -rw-r--r-- | view/theme/redbasic/schema/simple_black_on_white.php (renamed from view/theme/redbasic/schema/simple: black on white.php) | 0 | ||||
| -rw-r--r-- | view/theme/redbasic/schema/simple_green_on_black.php (renamed from view/theme/redbasic/schema/simple: green on black.php) | 0 | ||||
| -rw-r--r-- | view/theme/redbasic/schema/simple_white_on_black.php (renamed from view/theme/redbasic/schema/simple: white on black.php) | 0 | ||||
| -rwxr-xr-x | view/tpl/abook_edit.tpl | 21 | ||||
| -rwxr-xr-x | view/tpl/nav.tpl | 3 | ||||
| -rwxr-xr-x | view/tpl/photo_album.tpl | 26 | ||||
| -rwxr-xr-x | view/tpl/photo_top.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/settings.tpl | 9 |
10 files changed, 50 insertions, 37 deletions
diff --git a/view/js/main.js b/view/js/main.js index f3b252171..cf3749441 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -893,7 +893,13 @@ function updateConvItems(mode,data) { return true; } - + function importElement(elem) { + $.post( + "impel", + { "element" : elem } + ); + return false; + } function preview_post() { $("#jot-preview").val("1"); @@ -1069,6 +1075,7 @@ function previewTheme(elm) { } $(document).ready(function() { + jQuery.timeago.settings.strings = { prefixAgo : aStr['t01'], prefixFromNow : aStr['t02'], diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 1d43fe983..7df70e714 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -75,12 +75,12 @@ a:hover, .fakelink:hover { color: $link_colour; text-decoration: underline; } a.btn-default { color: #333; - + font-weight: normal; } a.btn-success { color: #fff; -font-weight: normal; + font-weight: normal; } input[type="text"], @@ -166,6 +166,19 @@ header { filter:alpha(opacity=$nav_percent_min_opacity); } +#powered-by { + font-size: 0.5rem; + position: absolute; + top: 50px; + left: 16px; +} + +#powered-by img { + margin-top: -2px; + height: 10px; + width: 10px; +} + .error-message { color: #FF0000; font-size: 1.1em; diff --git a/view/theme/redbasic/schema/simple: black on white.php b/view/theme/redbasic/schema/simple_black_on_white.php index cdd85a129..cdd85a129 100644 --- a/view/theme/redbasic/schema/simple: black on white.php +++ b/view/theme/redbasic/schema/simple_black_on_white.php diff --git a/view/theme/redbasic/schema/simple: green on black.php b/view/theme/redbasic/schema/simple_green_on_black.php index 3a1ea9134..3a1ea9134 100644 --- a/view/theme/redbasic/schema/simple: green on black.php +++ b/view/theme/redbasic/schema/simple_green_on_black.php diff --git a/view/theme/redbasic/schema/simple: white on black.php b/view/theme/redbasic/schema/simple_white_on_black.php index 74d133038..74d133038 100644 --- a/view/theme/redbasic/schema/simple: white on black.php +++ b/view/theme/redbasic/schema/simple_white_on_black.php diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl index f7bcb56c3..95285ac79 100755 --- a/view/tpl/abook_edit.tpl +++ b/view/tpl/abook_edit.tpl @@ -58,31 +58,10 @@ <h3>{{$permlbl}}</h3> <div id="perm-desc" class="descriptive-text">{{$permnote}}</div> - -{{* {{if $noperms}} -<div id="noperm-msg" class="warning-text">{{$noperms}}</div> -<div id="noperm-text" class="descriptive-text">{{$noperm_desc}}</div> -{{/if}} -*}} - - - <br /> -<h3>{{$quick}}</h3> -<ul> -{{if $self}} -<li><span class="fakelink" onclick="connectClear();">{{$clear}}</span></li> -<li><span class="fakelink" onclick="connectForum();">{{$forum}}</span></li> -<li><span class="fakelink" onclick="connectSoapBox();">{{$soapbox}}</span></li> -{{/if}} -<li><span class="fakelink" onclick="connectFullShare();">{{$full}}</span></li> -<li><span class="fakelink" onclick="connectCautiousShare();">{{$cautious}}</span></li> -<li><span class="fakelink" onclick="connectFollowOnly();">{{$follow}}</span></li> -</ul> <input class="contact-edit-submit" type="submit" name="done" value="{{$submit}}" /> - <div id="abook-advanced" class="fakelink" onclick="openClose('abook-advanced-panel');">{{$advanced}}</div> <div id="abook-advanced-panel" style="display: block;"> diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 2953f3b41..6c461f062 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -166,6 +166,9 @@ <a href="/search" title="{{$nav.search.3}}"><i class="icon-search"></i></a> </li> + {{if $powered_by}} + <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}}"><i class="icon-sitemap"></i></a> diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl index b5ea14c14..d23f7e817 100755 --- a/view/tpl/photo_album.tpl +++ b/view/tpl/photo_album.tpl @@ -1,3 +1,23 @@ -<a href="{{$photolink}}" id="photo-album-photo-link-{{$id}}" title="{{$phototitle}}" rel="{{$rel}}"> - <img src="{{$imgsrc}}" alt="{{if $desc}}{{$desc}}{{else}}{{$imgalt}}{{/if}}" title="{{$phototitle}}" id="photo-album-photo-{{$id}}" /> -</a> +<div class="section-title-wrapper"> + <div class="btn-group btn-group-xs pull-right"> + {{if $edit}} + <a class="btn btn-default" href="{{$edit.1}}" title="{{$edit.0}}"><i class="icon-pencil"></i></a> + {{/if}} + <a class="btn btn-default" href="{{$order.1}}" title="{{$order.0}}"><i class="icon-sort"></i></a> + {{if $can_post}} + <a class="btn btn-xs btn-success" href="{{$upload.1}}"><i class="icon-upload"></i> {{$upload.0}}</a> + {{/if}} + </div> + <h2>{{$album}}</h2> + + <div class="clear"></div> +</div> +<div id="photo-album-contents"> + {{foreach $photos as $photo}} + {{include file="photo_top.tpl"}} + {{/foreach}} + <div id="page-end"></div> +</div> +<div class="photos-end"></div> +<script>$(document).ready(function() { loadingPage = false; justifyPhotos(); });</script> +<div id="page-spinner"></div> diff --git a/view/tpl/photo_top.tpl b/view/tpl/photo_top.tpl index 4a106c30d..ee21e5cce 100755 --- a/view/tpl/photo_top.tpl +++ b/view/tpl/photo_top.tpl @@ -1,4 +1,4 @@ <a href="{{$photo.link}}" id="photo-top-photo-link-{{$photo.id}}" title="{{$photo.title}}"> - <img src="{{$photo.src}}" alt="{{$photo.album.name}}" title="{{$photo.title}}" id="photo-top-photo-{{$photo.id}}" /> + <img src="{{$photo.src}}" alt="{{if $photo.album.name}}{{$photo.album.name}}{{elseif $photo.desc}}{{$photo.desc}}{{else}}{{$photo.alt}}{{/if}}" title="{{$photo.title}}" id="photo-top-photo-{{$photo.id}}" /> </a> diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index 4dba1f23e..1340a1653 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -24,15 +24,6 @@ {{include file="field_checkbox.tpl" field=$hide_presence}} -<h3 id="settings-privacy-macros">{{$lbl_pmacro}}</h3> -<ul id="settings-privacy-macros"> -<li><a href="#" onclick="channel_privacy_macro(2); return false" id="settings_pmacro2">{{$pmacro2}}</a></li> -<li><a href="#" onclick="channel_privacy_macro(1); return false" id="settings_pmacro1">{{$pmacro1}}</a></li> -<li><a href="#" onclick="channel_privacy_macro(3); return false" id="settings_pmacro3">{{$pmacro3}}</a></li> -<li><a href="#" onclick="channel_privacy_macro(0); return false" id="settings_pmacro0">{{$pmacro0}}</a></li> -</ul> - - <button type="button" class="btn btn-xs btn-default" data-toggle="collapse" data-target="#settings-permissions-wrapper">{{$lbl_p2macro}}</button> |