diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-05-03 14:18:40 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-05-03 14:18:40 -0400 |
| commit | 4c8a82456e9f4085984573a8a226ebe3d734aa6c (patch) | |
| tree | 2f1d6384b3f68c360861715e12dcf59a48145411 /view | |
| parent | 0446766f0407b45c78031ad9e5029cc9218b025e (diff) | |
| parent | d72db2e1aa68833cbebc1c24ab4e1c6c9c966679 (diff) | |
| download | volse-hubzilla-4c8a82456e9f4085984573a8a226ebe3d734aa6c.tar.gz volse-hubzilla-4c8a82456e9f4085984573a8a226ebe3d734aa6c.tar.bz2 volse-hubzilla-4c8a82456e9f4085984573a8a226ebe3d734aa6c.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
diabook-theme: small fix
Avoid tagging both '@Robert Johnson' and also '@Robert', when '@Robert Johnson' was already matched, and '@Robert' might be somebody different entirely.
* master:
Diffstat (limited to 'view')
| -rwxr-xr-x | view/theme/diabook/communityhome.tpl | 4 | ||||
| -rwxr-xr-x | view/theme/diabook/theme.php | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/view/theme/diabook/communityhome.tpl b/view/theme/diabook/communityhome.tpl index 87b825d98..0386d63d3 100755 --- a/view/theme/diabook/communityhome.tpl +++ b/view/theme/diabook/communityhome.tpl @@ -1,9 +1,9 @@ -<div id="pos_null"> +<div id="pos_null" style="margin-bottom:-30px;"> </div> <div id="sortable_boxes"> -<div id="close_pages"> +<div id="close_pages" style="margin-top:30px;"> {{ if $page }} <div>$page</div> {{ endif }} diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index eaf17bea1..f8fdeb8b1 100755 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php @@ -117,8 +117,10 @@ if ($color=="dark") $color_path = "/diabook-dark/"; $a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $imageresizeJS); //load jquery.ui.js + if($ccCookie != "9") { $jqueryuiJS = $a->get_baseurl($ssl_state)."/view/theme/diabook/js/jquery-ui-1.8.20.custom.min.js"; $a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $jqueryuiJS); + } //load jquery.twitter.search.js if($_COOKIE['close_twitter'] != "1") { |