diff options
author | friendica <info@friendica.com> | 2013-03-06 15:13:54 -0800 |
---|---|---|
committer | friendica <info@friendica.com> | 2013-03-06 15:13:54 -0800 |
commit | c5d0da43e57cf812dd3a88b04740728f7ae65523 (patch) | |
tree | 451edffe9046b558cfeff238f218574a5385e9fd /view | |
parent | 5754d18286b4fbeeea362eea2d95296c83c59a11 (diff) | |
download | volse-hubzilla-c5d0da43e57cf812dd3a88b04740728f7ae65523.tar.gz volse-hubzilla-c5d0da43e57cf812dd3a88b04740728f7ae65523.tar.bz2 volse-hubzilla-c5d0da43e57cf812dd3a88b04740728f7ae65523.zip |
tweaky tweak, plus add share tracking db, and don't show acl for guest postings, and experiment with compressing pcss on the fly
Diffstat (limited to 'view')
-rw-r--r-- | view/theme/redbasic/css/style.css | 4 | ||||
-rw-r--r-- | view/theme/redbasic/php/style.php | 11 | ||||
-rw-r--r-- | view/tpl/jot.tpl | 2 | ||||
-rw-r--r-- | view/tpl/smarty3/jot.tpl | 2 | ||||
-rw-r--r-- | view/tpl/smarty3/suggest_friends.tpl | 2 | ||||
-rw-r--r-- | view/tpl/suggest_friends.tpl | 2 |
6 files changed, 19 insertions, 4 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 94d52e995..d6a9cb800 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -3775,4 +3775,6 @@ ul.menu-popup { .contact-block-content { margin-top: 8px; -}
\ No newline at end of file +} + +.profile-match-connect { margin-top: 5px; }
\ No newline at end of file diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 2b1d68519..bae202c7a 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -51,7 +51,16 @@ $nav_bg_2 = "2e2f2e";} if(file_exists('view/theme/' . current_theme() . '/css/style.css')) { - echo file_get_contents('view/theme/' . current_theme() . '/css/style.css'); + $x = file_get_contents('view/theme/' . current_theme() . '/css/style.css'); + if(get_config('system','pcss_compress')) { + // this shaves off about 10%, probably not enough to worry about right now. + logger('pcss compress: original size: ' . strlen($x), LOGGER_DEBUG); + $x = str_replace(array("\r","\t"," "),array("",' ',' '),$x); + $x = preg_replace('/(\n[ ]+?)/s',"\n",$x); + $x = str_replace("\n","",$x); + logger('pcss compress: final size: ' . strlen($x), LOGGER_DEBUG); + } + echo $x; } echo "\r\n"; diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 6de2ef97e..84b6df679 100644 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -53,9 +53,11 @@ <a id="profile-nolocation" class="icon noglobe" title="$noloc" onclick="jotClearLocation();return false;"></a> </div> + {{ if $showacl }} <div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" > <a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate" title="$permset" ></a>$bang </div> + {{ endif }} {{ if $preview }}<span onclick="preview_post();" id="jot-preview-link" class="fakelink">$preview</span>{{ endif }} diff --git a/view/tpl/smarty3/jot.tpl b/view/tpl/smarty3/jot.tpl index 9ce34ee2f..2def156b2 100644 --- a/view/tpl/smarty3/jot.tpl +++ b/view/tpl/smarty3/jot.tpl @@ -58,9 +58,11 @@ <a id="profile-nolocation" class="icon noglobe" title="{{$noloc}}" onclick="jotClearLocation();return false;"></a> </div> + {{if $showacl}} <div id="profile-jot-perms" class="profile-jot-perms" style="display: {{$pvisit}};" > <a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon {{$lockstate}}" title="{{$permset}}" ></a>{{$bang}} </div> + {{/if}} {{if $preview}}<span onclick="preview_post();" id="jot-preview-link" class="fakelink">{{$preview}}</span>{{/if}} diff --git a/view/tpl/smarty3/suggest_friends.tpl b/view/tpl/smarty3/suggest_friends.tpl index 060db0005..f7c030919 100644 --- a/view/tpl/smarty3/suggest_friends.tpl +++ b/view/tpl/smarty3/suggest_friends.tpl @@ -4,7 +4,7 @@ * *}} <div class="profile-match-wrapper"> - <a href="{{$ignlnk}}" title="{{$ignore}}" class="icon drophide profile-match-ignore" onmouseout="imgdull(this);" onmouseover="imgbright(this);" onclick="return confirmDelete();" ></a> + <a href="{{$ignlnk}}" title="{{$ignore}}" class="icon drophide smalldrop profile-match-ignore" onmouseout="imgdull(this);" onmouseover="imgbright(this);" onclick="return confirmDelete();" ></a> <div class="profile-match-photo"> <a href="{{$url}}"> <img src="{{$photo}}" alt="{{$name}}" width="80" height="80" title="{{$name}} [{{$url}}]" /> diff --git a/view/tpl/suggest_friends.tpl b/view/tpl/suggest_friends.tpl index e97b5e8cc..d8913c91c 100644 --- a/view/tpl/suggest_friends.tpl +++ b/view/tpl/suggest_friends.tpl @@ -1,5 +1,5 @@ <div class="profile-match-wrapper"> - <a href="$ignlnk" title="$ignore" class="icon drophide profile-match-ignore" onmouseout="imgdull(this);" onmouseover="imgbright(this);" onclick="return confirmDelete();" ></a> + <a href="$ignlnk" title="$ignore" class="icon drophide smalldrop profile-match-ignore" onmouseout="imgdull(this);" onmouseover="imgbright(this);" onclick="return confirmDelete();" ></a> <div class="profile-match-photo"> <a href="$url"> <img src="$photo" alt="$name" width="80" height="80" title="$name [$url]" /> |