aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
Diffstat (limited to 'view')
-rw-r--r--view/css/widgets.css45
-rw-r--r--view/theme/redbasic/css/style.css8
-rwxr-xr-xview/tpl/group_side.tpl9
-rw-r--r--view/tpl/saved_searches.tpl2
-rwxr-xr-xview/tpl/saved_searches_aside.tpl2
5 files changed, 32 insertions, 34 deletions
diff --git a/view/css/widgets.css b/view/css/widgets.css
index 7c2a03c3b..c6ad647f7 100644
--- a/view/css/widgets.css
+++ b/view/css/widgets.css
@@ -45,23 +45,16 @@
opacity: 1;
}
-.savedsearchterm {
- margin-left: 10px;
+.saved-search-icon {
+ float: right;
}
-/* fileas */
-
-.fileas-ul li {
- margin-top: 10px;
+.savedsearchterm {
+ display: block;
+ width: 150px;
+ overflow: hidden;
}
-.fileas-link {
- margin-left: 24px;
-}
-
-.fileas-all {
- margin-left: 0px;
-}
/* posted date */
@@ -73,17 +66,6 @@
/* categories */
-.categories-ul li {
- margin-top: 10px;
-}
-
-.categories-link {
- margin-left: 24px;
-}
-
-.categories-all {
- margin-left: 0px;
-}
/* group */
@@ -91,17 +73,32 @@
margin-bottom: 10px;
}
+#sidebar-new-group {
+ margin-bottom: 10px;
+}
+
#sidebar-group-list .icon, #sidebar-group-list .iconspacer {
display: inline-block;
height: 12px;
width: 12px;
}
+.sidebar-group-name {
+ display: block;
+ width: 170px;
+ overflow: hidden;
+}
+
+#sidebar-group-ul {
+ margin-bottom: 10px;
+}
+
#sidebar-group-list li {
margin-top: 3px;
}
.groupsideedit {
+ float: right;
margin-right: 10px;
}
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 7ccee2a32..26bfdb656 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -234,6 +234,10 @@ aside ul {
padding: 0;
}
+aside li {
+ margin-top: 5px;
+}
+
/*TODO: we should use one class for all this. */
.group-selected, .fileas-selected, .categories-selected, .search-selected, .active {
color: #444444 !important;
@@ -1730,10 +1734,6 @@ margin-right: 50px;
list-style-type: none;
}
-.pmenu li {
- margin-left: -20px;
-}
-
.admin-icons {
font-size: 1.2em;
color: $toolicon_colour;
diff --git a/view/tpl/group_side.tpl b/view/tpl/group_side.tpl
index a0ed7a82d..dd3c7e737 100755
--- a/view/tpl/group_side.tpl
+++ b/view/tpl/group_side.tpl
@@ -1,6 +1,10 @@
<div class="widget" id="group-sidebar">
<h3>{{$title}}</h3>
+ <div id="sidebar-new-group">
+ <a href="group/new">{{$createtext}}</a>
+ </div>
+
<div id="sidebar-group-list">
<ul id="sidebar-group-ul">
{{foreach $groups as $group}}
@@ -15,14 +19,11 @@
{{if $group.edit}}
<a class="groupsideedit" href="{{$group.edit.href}}" title="{{$edittext}}"><i id="edit-sidebar-group-element-{{$group.id}}" class="group-edit-icon iconspacer icon-pencil"></i></a>
{{/if}}
- <a id="sidebar-group-element-{{$group.id}}" class="sidebar-group-element {{if $group.selected}}group-selected{{/if}}" href="{{$group.href}}">{{$group.text}}</a>
+ <span class="sidebar-group-name"><a id="sidebar-group-element-{{$group.id}}" class="sidebar-group-element {{if $group.selected}}group-selected{{/if}}" href="{{$group.href}}">{{$group.text}}</a></span>
</li>
{{/foreach}}
</ul>
</div>
- <div id="sidebar-new-group">
- <a href="group/new">{{$createtext}}</a>
- </div>
</div>
diff --git a/view/tpl/saved_searches.tpl b/view/tpl/saved_searches.tpl
index d0f9e2b0e..1a9f51af9 100644
--- a/view/tpl/saved_searches.tpl
+++ b/view/tpl/saved_searches.tpl
@@ -5,7 +5,7 @@
<ul id="saved-search-ul">
{{foreach $saved as $search}}
<li id="search-term-{{$search.id}}" class="saved-search-li clear">
- <a title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" href="{{$search.dellink}}"><i id="dropicon-saved-search-term-{{$search.id}}" class="icon-remove drop-icons iconspacer" ></i></a>
+ <a title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" href="{{$search.dellink}}"><i id="dropicon-saved-search-term-{{$search.id}}" class="icon-remove drop-icons iconspacer saved-search-icon" ></i></a>
<a id="saved-search-term-{{$search.id}}" class="savedsearchterm{{if $search.selected}} search-selected{{/if}}" href="{{$search.srchlink}}">{{$search.displayterm}}</a>
</li>
{{/foreach}}
diff --git a/view/tpl/saved_searches_aside.tpl b/view/tpl/saved_searches_aside.tpl
index 615eca39d..0258a7632 100755
--- a/view/tpl/saved_searches_aside.tpl
+++ b/view/tpl/saved_searches_aside.tpl
@@ -5,7 +5,7 @@
<ul id="saved-search-ul">
{{foreach $saved as $search}}
<li id="search-term-{{$search.id}}" class="saved-search-li clear">
- <a title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" href="network/?f=&amp;remove=1&amp;search={{$search.encodedterm}}"><i id="dropicon-saved-search-term-{{$search.id}}" class="icon-remove drop-icons iconspacer savedsearchdrop" ></i></a>
+ <a title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" href="network/?f=&amp;remove=1&amp;search={{$search.encodedterm}}"><i id="dropicon-saved-search-term-{{$search.id}}" class="icon-remove drop-icons iconspacer savedsearchdrop saved-search-icon" ></i></a>
<a id="saved-search-term-{{$search.id}}" class="savedsearchterm{{if $search.selected}} search-selected{{/if}}" href="network/?f=&amp;search={{$search.encodedterm}}">{{$search.displayterm}}</a>
</li>
{{/foreach}}