aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-07-07 16:50:25 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-07-07 16:50:25 -0700
commit6b41074396f72f8c47e3d6479b1035cde4a5c7f8 (patch)
tree4c1a32fcd5c5c5db13c4418241af974d9dedd5d2 /view
parent7db1bd23f0056a5918f6f1657fdc3a968c18574e (diff)
parentf6cf992aee86e69d1ea5790c22d4af40c266d79e (diff)
downloadvolse-hubzilla-6b41074396f72f8c47e3d6479b1035cde4a5c7f8.tar.gz
volse-hubzilla-6b41074396f72f8c47e3d6479b1035cde4a5c7f8.tar.bz2
volse-hubzilla-6b41074396f72f8c47e3d6479b1035cde4a5c7f8.zip
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Diffstat (limited to 'view')
-rw-r--r--view/css/conversation.css4
-rw-r--r--view/theme/redbasic/css/style.css6
-rw-r--r--view/theme/redbasic/schema/focus.css5
-rw-r--r--view/theme/redbasic/schema/focus.php2
-rwxr-xr-xview/tpl/conv_item.tpl3
-rwxr-xr-xview/tpl/conv_list.tpl3
-rw-r--r--view/tpl/dir_sort_links.tpl7
-rwxr-xr-xview/tpl/directory_header.tpl12
-rwxr-xr-xview/tpl/page_display.tpl19
-rwxr-xr-xview/tpl/photo_item.tpl2
-rwxr-xr-xview/tpl/search_item.tpl2
11 files changed, 35 insertions, 30 deletions
diff --git a/view/css/conversation.css b/view/css/conversation.css
index bb6887d59..7d4930aac 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -196,10 +196,6 @@ a.wall-item-name-link {
filter:alpha(opacity=100);
}
-.wall-item-wrapper-end {
- clear: both;
-}
-
.shared_header {
margin-bottom: 20px;
}
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index fcc089cf0..716298845 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -741,8 +741,8 @@ a.rateme, div.rateme {
}
.wall-item-conv {
- margin-top: 5px;
- margin-bottom: 25px;
+ padding-top: 5px;
+ padding-bottom: 10px;
}
@@ -1932,12 +1932,14 @@ nav .dropdown-menu {
background-color: $comment_item_colour;
border-bottom-left-radius: $radiuspx;
border-bottom-right-radius: $radiuspx;
+ word-wrap: break-word;
}
.section-content-wrapper-np {
background-color: $comment_item_colour;
border-bottom-left-radius: $radiuspx;
border-bottom-right-radius: $radiuspx;
+ word-wrap: break-word;
}
[id^="cloud-index-"]:hover td,
diff --git a/view/theme/redbasic/schema/focus.css b/view/theme/redbasic/schema/focus.css
index 8d945a83e..3d64b8a7d 100644
--- a/view/theme/redbasic/schema/focus.css
+++ b/view/theme/redbasic/schema/focus.css
@@ -21,7 +21,6 @@
}
.wall-item-conv {
- margin-bottom: 10px;
- margin-top: 10px;
- margin-left: 10px;
+ padding-top: 10px;
+ padding-left: 10px;
}
diff --git a/view/theme/redbasic/schema/focus.php b/view/theme/redbasic/schema/focus.php
index d93ee003e..4186c9f64 100644
--- a/view/theme/redbasic/schema/focus.php
+++ b/view/theme/redbasic/schema/focus.php
@@ -46,7 +46,7 @@ if (! $radius)
if (! $shadow)
$shadow = "0";
if (! $converse_width)
- $converse_width = "676";
+ $converse_width = "656";
if(! $top_photo)
$top_photo = '48px';
if(! $comment_indent)
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index 27632d770..30a007bd6 100755
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -165,8 +165,7 @@
</div>
<div class="clear"></div>
</div>
- <div class="wall-item-wrapper-end"></div>
- <div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div>
+ <div class="clear{{if $indent}} {{$indent}}{{/if}}"></div>
</div>
{{if $item.toplevel}}
{{foreach $item.children as $child}}
diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl
index cb2fb8959..5487d5937 100755
--- a/view/tpl/conv_list.tpl
+++ b/view/tpl/conv_list.tpl
@@ -179,8 +179,7 @@
</div>
<div class="clear"></div>
</div>
- <div class="wall-item-wrapper-end"></div>
- <div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div>
+ <div class="clear{{if $indent}} {{$indent}}{{/if}}"></div>
</div>
</div>
{{if $item.comment_lastcollapsed}}
diff --git a/view/tpl/dir_sort_links.tpl b/view/tpl/dir_sort_links.tpl
index 5cefe2f28..9346a7455 100644
--- a/view/tpl/dir_sort_links.tpl
+++ b/view/tpl/dir_sort_links.tpl
@@ -5,11 +5,4 @@
{{include file="field_checkbox.tpl" field=$globaldir}}
{{include file="field_checkbox.tpl" field=$pubforums}}
-{{$sort}}: <select onchange='window.location.href="{{$sorturl}}&order="+this.value'>
-<option value='normal' {{if $selected_sort == 'normal'}}selected='selected'{{/if}}>{{$normal}}</option>
-<option value='reverse' {{if $selected_sort == 'reverse'}}selected='selected'{{/if}}>{{$reverse}}</option>
-<option value='date' {{if $selected_sort == 'date'}}selected='selected'{{/if}}>{{$date}}</option>
-<option value='reversedate' {{if $selected_sort == 'reversedate'}}selected='selected'{{/if}}>{{$reversedate}}</option>
-</select><br />
-
</div>
diff --git a/view/tpl/directory_header.tpl b/view/tpl/directory_header.tpl
index 26739efc3..79598fc9a 100755
--- a/view/tpl/directory_header.tpl
+++ b/view/tpl/directory_header.tpl
@@ -1,6 +1,18 @@
<div class="generic-content-wrapper">
<div class="section-title-wrapper">
+ <div class="btn-group pull-right">
+ <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="{{$sort}}">
+ <i class="icon-sort"></i>
+ </button>
+ <ul class="dropdown-menu">
+ <li><a href="directory?f=&order=date{{$suggest}}">{{$date}}</a></li>
+ <li><a href="directory?f=&order=normal{{$suggest}}">{{$normal}}</a></li>
+ <li><a href="directory?f=&order=reversedate{{$suggest}}">{{$reversedate}}</a></li>
+ <li><a href="directory?f=&order=reverse{{$suggest}}">{{$reverse}}</a></li>
+ </ul>
+ </div>
<h2>{{$dirlbl}}{{if $search}}:&nbsp;{{$safetxt}}{{/if}}</h2>
+ <div class="clear"></div>
</div>
{{foreach $entries as $entry}}
{{include file="direntry.tpl"}}
diff --git a/view/tpl/page_display.tpl b/view/tpl/page_display.tpl
index 5328648b9..a320920c7 100755
--- a/view/tpl/page_display.tpl
+++ b/view/tpl/page_display.tpl
@@ -1,9 +1,14 @@
<div class="page">
-
-<div class="generic-content-wrapper" id="page-content-wrapper" >
- {{if $title}}<h2 class="page-title">{{$title}}</h2>{{/if}}
- <div class="page-author"><a class="page-author-link" href="{{$auth_url}}">{{$author}}</a></div>
- <div class="page-date">{{$date}}</div>
- <div class="page-body">{{$body}}</div>
-</div>
+ <div class="generic-content-wrapper" id="page-content-wrapper" >
+ {{if $title}}
+ <div class="section-title-wrapper">
+ <h2 class="page-title">{{$title}}</h2>
+ </div>
+ {{/if}}
+ <div class="section-content-wrapper">
+ <div class="page-author"><a class="page-author-link" href="{{$auth_url}}">{{$author}}</a></div>
+ <div class="page-date">{{$date}}</div>
+ <div class="page-body">{{$body}}</div>
+ </div>
+ </div>
</div>
diff --git a/view/tpl/photo_item.tpl b/view/tpl/photo_item.tpl
index 16f9a76c2..2ea7aa9f3 100755
--- a/view/tpl/photo_item.tpl
+++ b/view/tpl/photo_item.tpl
@@ -21,7 +21,7 @@
{{$comment}}
- <div class="wall-item-outside-wrapper-end{{$indent}}" ></div>
+ <div class="clear{{if $indent}} {{$indent}}{{/if}}"></div>
</div>
</div>
diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl
index dee33f1b3..256443b84 100755
--- a/view/tpl/search_item.tpl
+++ b/view/tpl/search_item.tpl
@@ -57,7 +57,7 @@
<a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title}}'>{{$item.conv.title}}</a>
</div>
{{/if}}
- <div class="wall-item-outside-wrapper-end {{$item.indent}}" ></div>
+ <div class="clear{{if $indent}} {{$indent}}{{/if}}"></div>
</div>
</div>