friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

incremental improvements

This commit is contained in:
Zach Prezkuta 2012-12-27 12:20:47 -07:00
parent 98c86d46d4
commit 659ae4ed04
28 changed files with 401 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
view/theme/frost-mobile/admin_users.tpl Normal file
View File

@ -0,0 +1,98 @@
<script>
function confirm_delete(uname){
return confirm( "$confirm_delete".format(uname));
}
function confirm_delete_multi(){
return confirm("$confirm_delete_multi");
}
function selectall(cls){
$j("."+cls).attr('checked','checked');
return false;
}
</script>
<div id='adminpage'>
<h1>$title - $page</h1>
<form action="$baseurl/admin/users" method="post">
<input type='hidden' name='form_security_token' value='$form_security_token'>
<h3>$h_pending</h3>
{{ if $pending }}
<table id='pending'>
<thead>
<tr>
{{ for $th_pending as $th }}<th>$th</th>{{ endfor }}
<th></th>
<th></th>
</tr>
</thead>
<tbody>
{{ for $pending as $u }}
<tr>
<td class="created">$u.created</td>
<td class="name">$u.name</td>
<td class="email">$u.email</td>
<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_$u.hash" name="pending[]" value="$u.hash" /></td>
<td class="tools">
<a href="$baseurl/regmod/allow/$u.hash" title='$approve'><span class='tool like'></span></a>
<a href="$baseurl/regmod/deny/$u.hash" title='$deny'><span class='tool dislike'></span></a>
</td>
</tr>
{{ endfor }}
</tbody>
</table>
<div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">$select_all</a></div>
<div class="submit"><input type="submit" name="page_users_deny" value="$deny"/> <input type="submit" name="page_users_approve" value="$approve" /></div>
{{ else }}
<p>$no_pending</p>
{{ endif }}
<h3>$h_users</h3>
{{ if $users }}
<table id='users'>
<thead>
<tr>
<th></th>
{{ for $th_users as $th }}<th>$th</th>{{ endfor }}
<th></th>
<th></th>
</tr>
</thead>
<tbody>
{{ for $users as $u }}
<tr>
<td><img src="$u.micro" alt="$u.nickname" title="$u.nickname"></td>
<td class='name'><a href="$u.url" title="$u.nickname" >$u.name</a></td>
<td class='email'>$u.email</td>
<td class='register_date'>$u.register_date</td>
<td class='login_date'>$u.login_date</td>
<td class='lastitem_date'>$u.lastitem_date</td>
<td class='login_date'>$u.page_flags {{ if $u.is_admin }}($siteadmin){{ endif }}</td>
<td class="checkbox">
{{ if $u.is_admin }}
&nbsp;
{{ else }}
<input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
{{ endif }}
<td class="tools">
{{ if $u.is_admin }}
&nbsp;
{{ else }}
<a href="$baseurl/admin/users/block/$u.uid?t=$form_security_token" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
<a href="$baseurl/admin/users/delete/$u.uid?t=$form_security_token" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon drop'></span></a>
{{ endif }}
</td>
</tr>
{{ endfor }}
</tbody>
</table>
<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">$select_all</a></div>
<div class="submit"><input type="submit" name="page_users_block" value="$block/$unblock" /> <input type="submit" name="page_users_delete" value="$delete" onclick="return confirm_delete_multi()" /></div>
{{ else }}
NO USERS?!?
{{ endif }}
</form>
</div>

2
view/theme/frost-mobile/default.php
View File

@ -5,7 +5,7 @@
<script>var baseurl="<?php echo $a->get_baseurl() ?>";</script> <script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>
<?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?> <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
</head> </head>
<body> <body <?php if($a->module === 'home') echo 'onLoad="setTimeout(\'homeRedirect()\', 1500)"'?>>
<?php if(x($page,'nav')) echo $page['nav']; ?> <?php if(x($page,'nav')) echo $page['nav']; ?>
<?php if( $a->module === 'home' ) { ?> <?php if( $a->module === 'home' ) { ?>

0
view/theme/frost-mobile/friendika-16.png → view/theme/frost-mobile/friendica-16.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 699 B

After

Width:  |  Height:  |  Size: 699 B

10
view/theme/frost-mobile/jot.tpl
View File

@ -28,6 +28,10 @@
<div id="profile-jot-submit-wrapper" class="jothidden"> <div id="profile-jot-submit-wrapper" class="jothidden">
<input type="submit" id="profile-jot-submit" name="submit" value="$share" /> <input type="submit" id="profile-jot-submit" name="submit" value="$share" />
<div id="profile-rotator-wrapper" style="display: $visitor;" >
<img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
</div>
<div id="profile-upload-wrapper" style="display: $visitor;" > <div id="profile-upload-wrapper" style="display: $visitor;" >
<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="$upload"></a></div> <div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="$upload"></a></div>
</div> </div>
@ -64,10 +68,6 @@
$jotplugins $jotplugins
</div> </div>
<div id="profile-rotator-wrapper" style="display: $visitor;" >
<img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
</div>
<div id="jot-preview-content" style="display:none;"></div> <div id="jot-preview-content" style="display:none;"></div>
<div style="display: none;"> <div style="display: none;">
@ -75,8 +75,8 @@
$acl $acl
<hr style="clear:both"/> <hr style="clear:both"/>
<div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" /> <div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
<div id="profile-jot-email-end"></div>
$jotnets $jotnets
<div id="profile-jot-networks-end"></div>
</div> </div>
</div> </div>

41
view/theme/frost-mobile/js/main.js
View File

@ -1,20 +1,33 @@
function openClose(theID) { function openClose(listID) {
if(document.getElementById(theID).style.display == "block") { /* if(document.getElementById(theID).style.display == "block") {
document.getElementById(theID).style.display = "none" document.getElementById(theID).style.display = "none"
} }
else { else {
document.getElementById(theID).style.display = "block" document.getElementById(theID).style.display = "block"
} }*/
} listID = "#" + listID.replace(/:/g, "\\:");
listID = listID.replace(/\./g, "\\.");
listID = listID.replace(/@/g, "\\@");
function openMenu(theID) { if($j(listID).is(":visible")) {
document.getElementById(theID).style.display = "block" $j(listID).hide();
} $j(listID+"-wrapper").show();
alert($j(listID+"-wrapper").attr("id"));
}
else {
$j(listID).show();
$j(listID+"-wrapper").hide();
}
}
function closeMenu(theID) { function openMenu(theID) {
document.getElementById(theID).style.display = "none" document.getElementById(theID).style.display = "block"
} }
function closeMenu(theID) {
document.getElementById(theID).style.display = "none"
}

2
view/theme/frost-mobile/js/main.min.js vendored
View File

File diff suppressed because one or more lines are too long

7
view/theme/frost-mobile/js/theme.js
View File

@ -235,6 +235,13 @@ $j(function(){
function homeRedirect() {
$j('html').fadeOut('slow', function(){
window.location = baseurl + "/login";
});
}
function insertFormatting(comment,BBcode,id) { function insertFormatting(comment,BBcode,id) {
var tmpStr = $j("#comment-edit-text-" + id).val(); var tmpStr = $j("#comment-edit-text-" + id).val();

2
view/theme/frost-mobile/js/theme.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
view/theme/frost-mobile/login-style.css
View File

@ -36,6 +36,9 @@ div.jGrowl div.info {
top: 15px; top: 15px;
right: 10px; right: 10px;
} }
div.jGrowl-notification {
border-radius: 7px;
}
.login-button { .login-button {
margin-top: 90px; margin-top: 90px;
@ -89,6 +92,7 @@ div.section-wrapper {
#div_id_remember { #div_id_remember {
margin-top: 10px; margin-top: 10px;
margin-bottom: 10px;
} }
#login_openid { #login_openid {

18
view/theme/frost-mobile/style.css
View File

@ -1164,14 +1164,14 @@ input#dfrn-url {
} }
.wall-item-content-wrapper { .wall-item-content-wrapper {
padding-top: 30px; padding-top: 1em;
border-top: 2px solid #AAAAAA; border-top: 2px solid #AAAAAA;
position: relative; position: relative;
} }
.wall-item-content-wrapper.comment { .wall-item-content-wrapper.comment {
margin-top: 30px; margin-top: 15px;
padding-top: 0px; padding-top: 0px;
margin-left: 5px; margin-left: 5px;
margin-right: 5px; margin-right: 5px;
@ -1261,7 +1261,7 @@ input#dfrn-url {
/* z-index: 100;*/ /* z-index: 100;*/
} }
.wall-item-lock { .wall-item-lock {
margin-top: 30px; margin-top: 1em;
left: 105px; left: 105px;
position: absolute; position: absolute;
top: 1px; top: 1px;
@ -1355,11 +1355,11 @@ input#dfrn-url {
} }
.wall-item-photo { .wall-item-photo {
border: none; border: none;
border-radius: 7px;
} }
.comment .wall-item-photo { .comment .wall-item-photo {
width: 50px !important; width: 50px !important;
height: 50px !important; height: 50px !important;
border-top-left-radius: 10px;
} }
.wall-item-content { .wall-item-content {
float: left; float: left;
@ -1630,6 +1630,9 @@ input#dfrn-url {
#profile-jot-plugin-end{ #profile-jot-plugin-end{
clear: both; clear: both;
} }
input#profile-jot-email {
display: block;
}
.profile-jot-net { .profile-jot-net {
float: left; float: left;
margin-right: 10px; margin-right: 10px;
@ -2123,14 +2126,14 @@ input#dfrn-url {
} }
#profile-jot-acl-wrapper{ #profile-jot-acl-wrapper{
width:270px; /*width:270px;*/
padding-left:10px; padding-left:10px;
height:auto; height:auto;
overflow:visible; overflow:visible;
} }
#acl-wrapper { #acl-wrapper {
width: 270px; /*width: 270px;*/
float:left; float:left;
} }
#acl-search { #acl-search {
@ -3898,6 +3901,9 @@ div.jGrowl div.info {
top: 15px; top: 15px;
right: 10px; right: 10px;
} }
div.jGrowl-notification {
border-radius: 7px;
}
.qcomment { .qcomment {
border: 1px solid #EEE; border: 1px solid #EEE;
padding: 3px; padding: 3px;

18
view/theme/frost-mobile/theme.php
View File

@ -4,18 +4,20 @@
* Name: Frost--mobile version * Name: Frost--mobile version
* Description: Like frosted glass * Description: Like frosted glass
* Credits: Navigation icons taken from http://iconza.com. Other icons taken from http://thenounproject.com, including: Like, Dislike, Black Lock, Unlock, Pencil, Tag, Camera, Paperclip (Marie Coons), Folder (Sergio Calcara), Chain-link (Andrew Fortnum), Speaker (Harold Kim), Quotes (Henry Ryder), Video Camera (Anas Ramadan), and Left Arrow, Right Arrow, and Delete X (all three P.J. Onori). All under Attribution (CC BY 3.0). Others from The Noun Project are public domain or No Rights Reserved (CC0). * Credits: Navigation icons taken from http://iconza.com. Other icons taken from http://thenounproject.com, including: Like, Dislike, Black Lock, Unlock, Pencil, Tag, Camera, Paperclip (Marie Coons), Folder (Sergio Calcara), Chain-link (Andrew Fortnum), Speaker (Harold Kim), Quotes (Henry Ryder), Video Camera (Anas Ramadan), and Left Arrow, Right Arrow, and Delete X (all three P.J. Onori). All under Attribution (CC BY 3.0). Others from The Noun Project are public domain or No Rights Reserved (CC0).
* Version: Version 0.2.16 * Version: Version 0.2.17
* Author: Zach P <techcity@f.shmuz.in> * Author: Zach P <techcity@f.shmuz.in>
* Maintainer: Zach P <techcity@f.shmuz.in> * Maintainer: Zach P <techcity@f.shmuz.in>
*/ */
$a->theme_info = array(); function frost_mobile_init(&$a) {
$a->sourcename = 'Friendica mobile web'; $a->theme_info = array();
$a->videowidth = 250; $a->sourcename = 'Friendica mobile web';
$a->videoheight = 200; $a->videowidth = 250;
$a->theme_thread_allow = false; $a->videoheight = 200;
$a->force_max_items = 10; $a->theme_thread_allow = false;
set_template_engine($a, 'smarty3'); $a->force_max_items = 10;
set_template_engine($a, 'smarty3');
}
function frost_mobile_content_loaded(&$a) { function frost_mobile_content_loaded(&$a) {

98
view/theme/frost/admin_users.tpl Normal file
View File

@ -0,0 +1,98 @@
<script>
function confirm_delete(uname){
return confirm( "$confirm_delete".format(uname));
}
function confirm_delete_multi(){
return confirm("$confirm_delete_multi");
}
function selectall(cls){
$j("."+cls).attr('checked','checked');
return false;
}
</script>
<div id='adminpage'>
<h1>$title - $page</h1>
<form action="$baseurl/admin/users" method="post">
<input type='hidden' name='form_security_token' value='$form_security_token'>
<h3>$h_pending</h3>
{{ if $pending }}
<table id='pending'>
<thead>
<tr>
{{ for $th_pending as $th }}<th>$th</th>{{ endfor }}
<th></th>
<th></th>
</tr>
</thead>
<tbody>
{{ for $pending as $u }}
<tr>
<td class="created">$u.created</td>
<td class="name">$u.name</td>
<td class="email">$u.email</td>
<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_$u.hash" name="pending[]" value="$u.hash" /></td>
<td class="tools">
<a href="$baseurl/regmod/allow/$u.hash" title='$approve'><span class='tool like'></span></a>
<a href="$baseurl/regmod/deny/$u.hash" title='$deny'><span class='tool dislike'></span></a>
</td>
</tr>
{{ endfor }}
</tbody>
</table>
<div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">$select_all</a></div>
<div class="submit"><input type="submit" name="page_users_deny" value="$deny"/> <input type="submit" name="page_users_approve" value="$approve" /></div>
{{ else }}
<p>$no_pending</p>
{{ endif }}
<h3>$h_users</h3>
{{ if $users }}
<table id='users'>
<thead>
<tr>
<th></th>
{{ for $th_users as $th }}<th>$th</th>{{ endfor }}
<th></th>
<th></th>
</tr>
</thead>
<tbody>
{{ for $users as $u }}
<tr>
<td><img src="$u.micro" alt="$u.nickname" title="$u.nickname"></td>
<td class='name'><a href="$u.url" title="$u.nickname" >$u.name</a></td>
<td class='email'>$u.email</td>
<td class='register_date'>$u.register_date</td>
<td class='login_date'>$u.login_date</td>
<td class='lastitem_date'>$u.lastitem_date</td>
<td class='login_date'>$u.page_flags {{ if $u.is_admin }}($siteadmin){{ endif }}</td>
<td class="checkbox">
{{ if $u.is_admin }}
&nbsp;
{{ else }}
<input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
{{ endif }}
<td class="tools">
{{ if $u.is_admin }}
&nbsp;
{{ else }}
<a href="$baseurl/admin/users/block/$u.uid?t=$form_security_token" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
<a href="$baseurl/admin/users/delete/$u.uid?t=$form_security_token" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon drop'></span></a>
{{ endif }}
</td>
</tr>
{{ endfor }}
</tbody>
</table>
<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">$select_all</a></div>
<div class="submit"><input type="submit" name="page_users_block" value="$block/$unblock" /> <input type="submit" name="page_users_delete" value="$delete" onclick="return confirm_delete_multi()" /></div>
{{ else }}
NO USERS?!?
{{ endif }}
</form>
</div>

4
view/theme/frost/contacts-template.tpl
View File

@ -2,6 +2,8 @@
{{ if $finding }}<h4>$finding</h4>{{ endif }} {{ if $finding }}<h4>$finding</h4>{{ endif }}
$tabs
<div id="contacts-search-wrapper"> <div id="contacts-search-wrapper">
<form id="contacts-search-form" action="$cmd" method="get" > <form id="contacts-search-form" action="$cmd" method="get" >
<span class="contacts-search-desc">$desc</span> <span class="contacts-search-desc">$desc</span>
@ -11,8 +13,6 @@
</div> </div>
<div id="contacts-search-end"></div> <div id="contacts-search-end"></div>
$tabs
<div id="contacts-display-wrapper"> <div id="contacts-display-wrapper">
{{ for $contacts as $c }} {{ for $contacts as $c }}

2
view/theme/frost/default.php
View File

@ -5,7 +5,7 @@
<script>var baseurl="<?php echo $a->get_baseurl() ?>";</script> <script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>
<?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?> <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
</head> </head>
<body> <body <?php if($a->module === 'home') echo 'onLoad="setTimeout(\'homeRedirect()\', 1500)"'?>>
<?php if(x($page,'nav')) echo $page['nav']; ?> <?php if(x($page,'nav')) echo $page['nav']; ?>
<?php if( $a->module === 'home' ) { ?> <?php if( $a->module === 'home' ) { ?>

0
view/theme/frost/friendika-16.png → view/theme/frost/friendica-16.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 699 B

After

Width:  |  Height:  |  Size: 699 B

8
view/theme/frost/jot.tpl
View File

@ -27,6 +27,10 @@
<div id="profile-jot-submit-wrapper" class="jothidden"> <div id="profile-jot-submit-wrapper" class="jothidden">
<input type="submit" id="profile-jot-submit" name="submit" value="$share" /> <input type="submit" id="profile-jot-submit" name="submit" value="$share" />
<div id="profile-rotator-wrapper" style="display: $visitor;" >
<img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
</div>
<div id="profile-upload-wrapper" style="display: $visitor;" > <div id="profile-upload-wrapper" style="display: $visitor;" >
<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="$upload"></a></div> <div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="$upload"></a></div>
</div> </div>
@ -65,10 +69,6 @@
<!-- <span id="jot-display-location" style="display: none;"></span>--> <!-- <span id="jot-display-location" style="display: none;"></span>-->
<div id="profile-rotator-wrapper" style="display: $visitor;" >
<img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
</div>
<div id="jot-preview-content" style="display:none;"></div> <div id="jot-preview-content" style="display:none;"></div>
<div style="display: none;"> <div style="display: none;">

40
view/theme/frost/js/main.js
View File

@ -1,20 +1,32 @@
function openClose(theID) { function openClose(listID) {
if(document.getElementById(theID).style.display == "block") { /* if(document.getElementById(theID).style.display == "block") {
document.getElementById(theID).style.display = "none" document.getElementById(theID).style.display = "none"
} }
else { else {
document.getElementById(theID).style.display = "block" document.getElementById(theID).style.display = "block"
} }*/
} listID = "#" + listID.replace(/:/g, "\\:");
listID = listID.replace(/\./g, "\\.");
listID = listID.replace(/@/g, "\\@");
function openMenu(theID) { if($j(listID).is(":visible")) {
document.getElementById(theID).style.display = "block" $j(listID).hide();
} $j(listID+"-wrapper").show();
}
else {
$j(listID).show();
$j(listID+"-wrapper").hide();
}
}
function closeMenu(theID) { function openMenu(theID) {
document.getElementById(theID).style.display = "none" document.getElementById(theID).style.display = "block"
} }
function closeMenu(theID) {
document.getElementById(theID).style.display = "none"
}

2
view/theme/frost/js/main.min.js vendored
View File

File diff suppressed because one or more lines are too long

17
view/theme/frost/js/theme.js
View File

@ -29,10 +29,10 @@ $j(document).ready(function() {
$j("#profile-jot-text").click(enableOnUser); $j("#profile-jot-text").click(enableOnUser);
$j('.nav-menu-link').hover(function() { $j('.nav-menu-list, .nav-menu-icon').hover(function() {
showNavMenu($j(this).attr('rel')); showNavMenu($j(this).attr('point'));
}, function() { }, function() {
hideNavMenu($j(this).attr('rel')); hideNavMenu($j(this).attr('point'));
}); });
/* $j('html').click(function() { $j("#nav-notifications-menu" ).hide(); });*/ /* $j('html').click(function() { $j("#nav-notifications-menu" ).hide(); });*/
@ -305,6 +305,13 @@ $j(function(){
}); });
function homeRedirect() {
$j('html').fadeOut('slow', function(){
window.location = baseurl + "/login";
});
}
if(typeof window.photoEdit != 'undefined') { if(typeof window.photoEdit != 'undefined') {
$j(document).keydown(function(event) { $j(document).keydown(function(event) {
@ -616,8 +623,8 @@ function initEditor(cb){
$j("#profile-jot-text").contact_autocomplete(baseurl+"/acl"); $j("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
editor = true; editor = true;
$j("a#jot-perms-icon").fancybox({ $j("a#jot-perms-icon").fancybox({
'transitionIn' : 'elastic', 'transitionIn' : 'none', //'elastic',
'transitionOut' : 'elastic' 'transitionOut' : 'none' //'elastic'
}); });
$j(".jothidden").show(); $j(".jothidden").show();
if (typeof cb!="undefined") cb(); if (typeof cb!="undefined") cb();

2
view/theme/frost/js/theme.min.js vendored
View File

File diff suppressed because one or more lines are too long

BIN
view/theme/frost/lock.cur
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

4
view/theme/frost/login-style.css
View File

@ -31,6 +31,9 @@ div.jGrowl div.info {
top: 15px; top: 15px;
right: 15px; right: 15px;
} }
div.jGrowl-notification {
border-radius: 7px;
}
.login-button { .login-button {
margin-top: 110px; margin-top: 110px;
@ -89,6 +92,7 @@ div.section-wrapper {
#div_id_remember { #div_id_remember {
margin-top: 10px; margin-top: 10px;
margin-bottom: 10px;
} }
/*.openid input {*/ /*.openid input {*/

3
view/theme/frost/msg-header.tpl
View File

@ -2,7 +2,8 @@
<script language="javascript" type="text/javascript"> <script language="javascript" type="text/javascript">
window.nickname = "$nickname"; window.nickname = "$nickname";
window.linkURL = "$linkurl"; window.linkURL = "$linkurl";
var plaintext = "$editselect"; var none = "none"; // ugly hack: $editselect shouldn't be a string if TinyMCE is enabled, but should if it isn't
window.editSelect = $editselect;
window.ajaxType = 'msg-header'; window.ajaxType = 'msg-header';
window.autocompleteType = 'msg-header'; window.autocompleteType = 'msg-header';
</script> </script>

16
view/theme/frost/nav.tpl
View File

@ -7,10 +7,10 @@
<!-- <a id="system-menu-link" class="nav-link" href="#system-menu" title="Menu">Menu</a>--> <!-- <a id="system-menu-link" class="nav-link" href="#system-menu" title="Menu">Menu</a>-->
<div class="nav-button-container nav-menu-link" rel="#system-menu-list"> <div class="nav-button-container nav-menu-link" rel="#system-menu-list">
<a class="system-menu-link nav-link" href="$nav.settings.0" title="Main Menu"> <a class="system-menu-link nav-link nav-menu-icon" href="$nav.settings.0" title="Main Menu" point="#system-menu-list">
<img class="system-menu-link" src="$baseurl/view/theme/frost/images/menu.png"> <img class="system-menu-link" src="$baseurl/view/theme/frost/images/menu.png">
</a> </a>
<ul id="system-menu-list" class="nav-menu-list"> <ul id="system-menu-list" class="nav-menu-list" point="#system-menu-list">
{{ if $nav.login }} {{ if $nav.login }}
<a id="nav-login-link" class="nav-load-page-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> <a id="nav-login-link" class="nav-load-page-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a>
{{ endif }} {{ endif }}
@ -70,13 +70,15 @@
<!-- <a id="contacts-menu-link" class="nav-link" href="#contacts-menu" title="Contacts">Contacts</a>--> <!-- <a id="contacts-menu-link" class="nav-link" href="#contacts-menu" title="Contacts">Contacts</a>-->
<div class="nav-button-container nav-menu-link" rel="#contacts-menu-list"> <div class="nav-button-container nav-menu-link" rel="#contacts-menu-list">
<a class="contacts-menu-link nav-link" href="$nav.contacts.0" title="Contacts"> <a class="contacts-menu-link nav-link nav-menu-icon" href="$nav.contacts.0" title="Contacts" point="#contacts-menu-list">
<img class="contacts-menu-link" src="$baseurl/view/theme/frost/images/contacts.png"> <img class="contacts-menu-link" src="$baseurl/view/theme/frost/images/contacts.png">
</a> </a>
{{ if $nav.introductions }} {{ if $nav.introductions }}
<a id="nav-notify-link" class="$nav.introductions.2 $sel.introductions nav-load-page-link" href="$nav.introductions.0" title="$nav.introductions.3" >
<span id="intro-update" class="nav-ajax-left"></span> <span id="intro-update" class="nav-ajax-left"></span>
</a>
{{ endif }} {{ endif }}
<ul id="contacts-menu-list" class="nav-menu-list"> <ul id="contacts-menu-list" class="nav-menu-list" point="#contacts-menu-list">
{{ if $nav.contacts }} {{ if $nav.contacts }}
<li><a id="nav-contacts-link" class="$nav.contacts.2 nav-load-page-link" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a><li> <li><a id="nav-contacts-link" class="$nav.contacts.2 nav-load-page-link" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a><li>
{{ endif }} {{ endif }}
@ -103,13 +105,13 @@
<!-- <a id="network-menu-link" class="nav-link" href="#network-menu" title="Network">Network</a>--> <!-- <a id="network-menu-link" class="nav-link" href="#network-menu" title="Network">Network</a>-->
<div class="nav-button-container nav-menu-link" rel="#network-menu-list"> <div class="nav-button-container nav-menu-link" rel="#network-menu-list">
<a class="network-menu-link nav-link" href="$nav.network.0" title="Network"> <a class="nav-menu-icon network-menu-link nav-link" href="$nav.network.0" title="Network" point="#network-menu-list">
<img class="network-menu-link" src="$baseurl/view/theme/frost/images/network.png"> <img class="network-menu-link" src="$baseurl/view/theme/frost/images/network.png">
</a> </a>
{{ if $nav.network }} {{ if $nav.network }}
<span id="net-update" class="nav-ajax-left"></span> <span id="net-update" class="nav-ajax-left"></span>
{{ endif }} {{ endif }}
<ul id="network-menu-list" class="nav-menu-list"> <ul id="network-menu-list" class="nav-menu-list" point="#network-menu-list">
{{ if $nav.network }} {{ if $nav.network }}
<li> <li>
<a id="nav-network-link" class="$nav.network.2 $sel.network nav-load-page-link" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a> <a id="nav-network-link" class="$nav.network.2 $sel.network nav-load-page-link" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
@ -129,7 +131,7 @@
{{ endif }} {{ endif }}
</ul> </ul>
</div> </div>
{{ if $nav.network }} {{ if $nav.network }}
<div class="nav-button-container nav-menu-link" rel="#network-reset-button"> <div class="nav-button-container nav-menu-link" rel="#network-reset-button">
<a class="nav-menu-icon network-reset-link nav-link" href="$nav.net_reset.0" title="$nav.net_reset.3"> <a class="nav-menu-icon network-reset-link nav-link" href="$nav.net_reset.0" title="$nav.net_reset.3">

77
view/theme/frost/style.css
View File

@ -311,7 +311,7 @@ section {
padding-left: 1em; padding-left: 1em;
padding-right: 1em; padding-right: 1em;
padding-top: 1em; padding-top: 0.5em;
background-color: #ffffff; background-color: #ffffff;
/* background-image: url(border.jpg); /* background-image: url(border.jpg);
@ -319,20 +319,36 @@ section {
background-repeat: no-repeat;*/ background-repeat: no-repeat;*/
min-height: 112px; min-height: 112px;
border-top: 1px solid #babdb6; /* border-top: 1px solid #babdb6;*/
border-left: 1px dotted #AAA; border-top: 1px solid #CCC;
border-right: 1px dotted #AAA; border-left: 1px solid #CCC;
border-right: 1px solid #CCC;
border-top-left-radius: 10px;
border-top-right-radius: 10px;
} }
.tabs { .tabs {
height: 27px; height: 27px;
background-image: url(head.jpg); /*background-image: url(head.jpg);
background-repeat: repeat-x; background-repeat: repeat-x;
background-position: 0px -20px; background-position: 0px -20px;
border-bottom: 1px solid #babdb6; border-bottom: 1px solid #babdb6;*/
padding:0px; padding:0px;
} }
.tabs li { margin: 0px; list-style: none; } .tabs li { margin: 0px; list-style: none; }
.tabs a {
padding: 0.4em 0.5em;
margin-right: 0.5em;
margin-bottom: 0.5em;
border: 1px solid #aaa;
border-radius: 8px;
-moz-border-radius: 8px;
-webkit-border-radius: 8px;
box-shadow: -2px -2px 3px #aaa inset;
-moz-box-shadow: -2px -2px 3px #aaa inset;
-webkit-box-shadow: -2px -2px 3px #aaa inset;
}
.tab { .tab {
display:block; display:block;
float:left; float:left;
@ -342,7 +358,14 @@ section {
} }
.tab.active { .tab.active {
font-weight: bold; font-weight: bold;
box-shadow: 2px 2px 3px #aaa inset;
-moz-box-shadow: 2px 2px 3px #aaa inset;
-webkit-box-shadow: 2px 2px 3px #aaa inset;
}
#display-top-padding {
padding-top: 3em;
} }
@ -401,13 +424,17 @@ div.wall-item-content-wrapper.shiny {
} }
#jot-title, #jot-category { #jot-title, #jot-category {
border: 0px;
margin: 0px; margin: 0px;
height: 20px;
width: 530px;
margin-bottom: 5px; margin-bottom: 5px;
height: 20px;
width: 465px;
font-weight: bold; font-weight: bold;
border: 1px solid #ffffff; border: 1px solid #ffffff;
display: block;
clear: left;
} }
#jot-title::-webkit-input-placeholder{font-weight: normal;} #jot-title::-webkit-input-placeholder{font-weight: normal;}
@ -1013,6 +1040,12 @@ input#dfrn-url {
padding-left: 0px; padding-left: 0px;
} }
#contacts-search-wrapper {
padding-top: 1em;
padding-bottom: 2em;
clear: left;
}
#contacts-main { #contacts-main {
margin-top: 20px; margin-top: 20px;
margin-bottom: 20px; margin-bottom: 20px;
@ -1103,7 +1136,7 @@ input#dfrn-url {
} }
.wall-item-content-wrapper { .wall-item-content-wrapper {
padding-top: 30px; padding-top: 1em; /* wall-item-lock margin-top needs to match this */
border-top: 2px solid #AAA; border-top: 2px solid #AAA;
position: relative; position: relative;
@ -1205,7 +1238,7 @@ input#dfrn-url {
z-index: 100; z-index: 100;
} }
.wall-item-lock { .wall-item-lock {
margin-top: 30px; margin-top: 1em; /* needs to match .wall-item-content-wrapper padding-top */
left: 105px; left: 105px;
position: absolute; position: absolute;
top: 1px; top: 1px;
@ -1215,7 +1248,7 @@ input#dfrn-url {
margin-top: 0px; margin-top: 0px;
} }
.wall-item-ago { .wall-item-ago, .wall-item-ago a {
color: #888888; color: #888888;
font-size: 0.8em; font-size: 0.8em;
} }
@ -1301,10 +1334,16 @@ input#dfrn-url {
} }
.wall-item-photo { .wall-item-photo {
border: none; border: none;
border-radius: 7px;
-moz-border-radius: 7px;
-webkit-border-radius: 7px;
} }
.comment .wall-item-photo { .comment .wall-item-photo {
width: 50px !important; width: 50px !important;
height: 50px !important; height: 50px !important;
border-radius: 5px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
} }
.wall-item-content { .wall-item-content {
margin-left: 10px; margin-left: 10px;
@ -1467,6 +1506,11 @@ input#dfrn-url {
#profile-jot-submit-wrapper { #profile-jot-submit-wrapper {
margin-top: 15px; margin-top: 15px;
} }
#profile-jot-banner-wrapper {
height: 1.5em;
display: block;
clear: left
}
#profile-jot-submit { #profile-jot-submit {
float: left; float: left;
@ -3314,7 +3358,7 @@ aside input[type='text'] {
#adminpage table {width:100%; border-bottom: 1px solid #000000; margin: 5px 0px;} #adminpage table {width:100%; border-bottom: 1px solid #000000; margin: 5px 0px;}
#adminpage table th { text-align: left;} #adminpage table th { text-align: left;}
#adminpage td .icon { float: left;} #adminpage td .icon, #adminpage td .tool { float: left;}
#adminpage table#users img { width: 16px; height: 16px; } #adminpage table#users img { width: 16px; height: 16px; }
#adminpage table tr:hover { background-color: #bbc7d7; } #adminpage table tr:hover { background-color: #bbc7d7; }
#adminpage .selectall { text-align: right; } #adminpage .selectall { text-align: right; }
@ -3763,9 +3807,12 @@ div.jGrowl div.info {
padding-left: 58px; padding-left: 58px;
} }
#jGrowl.top-right { #jGrowl.top-right {
top: 15px; top: 75px;
right: 15px; right: 15px;
} }
div.jGrowl-notification {
border-radius: 7px;
}
.qcomment { .qcomment {
border: 1px solid #EEE; border: 1px solid #EEE;
padding: 3px; padding: 3px;

14
view/theme/frost/theme.php
View File

@ -4,16 +4,18 @@
* Name: Frost * Name: Frost
* Description: Like frosted glass * Description: Like frosted glass
* Credits: Navigation icons taken from http://iconza.com. Other icons taken from http://thenounproject.com, including: Like, Dislike, Black Lock, Unlock, Pencil, Tag, Camera, Paperclip (Marie Coons), Folder (Sergio Calcara), Chain-link (Andrew Fortnum), Speaker (Harold Kim), Quotes (Henry Ryder), Video Camera (Anas Ramadan), and Left Arrow, Right Arrow, and Delete X (all three P.J. Onori). All under Attribution (CC BY 3.0). Others from The Noun Project are public domain or No Rights Reserved (CC0). * Credits: Navigation icons taken from http://iconza.com. Other icons taken from http://thenounproject.com, including: Like, Dislike, Black Lock, Unlock, Pencil, Tag, Camera, Paperclip (Marie Coons), Folder (Sergio Calcara), Chain-link (Andrew Fortnum), Speaker (Harold Kim), Quotes (Henry Ryder), Video Camera (Anas Ramadan), and Left Arrow, Right Arrow, and Delete X (all three P.J. Onori). All under Attribution (CC BY 3.0). Others from The Noun Project are public domain or No Rights Reserved (CC0).
* Version: Version 0.3.1 * Version: Version 0.3.2
* Author: Zach P <techcity@f.shmuz.in> * Author: Zach P <techcity@f.shmuz.in>
* Maintainer: Zach P <techcity@f.shmuz.in> * Maintainer: Zach P <techcity@f.shmuz.in>
*/ */
$a->theme_info = array(); function frost_init(&$a) {
$a->videowidth = 400; $a->theme_info = array();
$a->videoheight = 330; $a->videowidth = 400;
$a->theme_thread_allow = false; $a->videoheight = 330;
set_template_engine($a, 'smarty3'); $a->theme_thread_allow = false;
set_template_engine($a, 'smarty3');
}
function frost_content_loaded(&$a) { function frost_content_loaded(&$a) {

4
view/theme/frost/threaded_conversation.tpl
View File

@ -4,6 +4,10 @@
<div id="item-delete-selected-top-desc" >$dropping</div> <div id="item-delete-selected-top-desc" >$dropping</div>
</div> </div>
<img id="item-delete-selected-top-rotator" class="like-rotator" src="images/rotator.gif" style="display: none;" /> <img id="item-delete-selected-top-rotator" class="like-rotator" src="images/rotator.gif" style="display: none;" />
{{ else }}
{{ if $mode==display }}
<div id="display-top-padding"></div>
{{ endif }}
{{ endif }} {{ endif }}
$live_update $live_update

2
view/theme/frost/wall_thread.tpl
View File

@ -40,7 +40,7 @@
</div> </div>
<!--<div class="wall-item-author">--> <!--<div class="wall-item-author">-->
<a href="$item.profile_url" target="redir" 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.to <a href="$item.owner_url" target="redir" 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> $item.vwall{{ endif }}<br /> <a href="$item.profile_url" target="redir" 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.to <a href="$item.owner_url" target="redir" 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> $item.vwall{{ endif }}<br />
<div class="wall-item-ago" id="wall-item-ago-$item.id" title="$item.localtime" >$item.ago</div> <div class="wall-item-ago" id="wall-item-ago-$item.id" title="$item.localtime" ><a href="display/$user.nickname/$item.id">$item.ago</a></div>
<!--</div>--> <!--</div>-->
<div class="wall-item-content" id="wall-item-content-$item.id" > <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> <div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>