Merge pull request #7154 from MrPetovan/task/refactor-widgets

Refactor widgets

view/templates/categories_widget.tpl

@@ -1,13 +0,0 @@
-
-<div id="categories-sidebar" class="widget">
-	<h3>{{$title}}</h3>
-	<div id="nets-desc">{{$desc nofilter}}</div>
-	
-	<ul class="categories-ul">
-		<li class="tool"><a href="{{$base}}" class="categories-link categories-all{{if $sel_all}} categories-selected{{/if}}">{{$all}}</a></li>
-		{{foreach $terms as $term}}
-			<li class="tool"><a href="{{$base}}?f=&category={{$term.name}}" class="categories-link{{if $term.selected}} categories-selected{{/if}}">{{$term.name}}</a></li>
-		{{/foreach}}
-	</ul>
-	
-</div>

view/templates/contacts-widget-sidebar.tpl

@@ -1,7 +0,0 @@
-
-{{$vcard_widget nofilter}}
-{{$findpeople_widget nofilter}}
-{{$follow_widget nofilter}}
-{{$groups_widget nofilter}}
-{{$networks_widget nofilter}}
-

view/templates/fileas_widget.tpl

@@ -1,13 +0,0 @@
-
-<div id="fileas-sidebar" class="widget">
-	<h3>{{$title}}</h3>
-	<div id="nets-desc">{{$desc nofilter}}</div>
-	
-	<ul class="fileas-ul">
-		<li class="tool"><a href="{{$base}}" class="fileas-link fileas-all{{if $sel_all}} fileas-selected{{/if}}">{{$all}}</a></li>
-		{{foreach $terms as $term}}
-			<li class="tool"><a href="{{$base}}?f=&file={{$term.name}}" class="fileas-link{{if $term.selected}} fileas-selected{{/if}}">{{$term.name}}</a></li>
-		{{/foreach}}
-	</ul>
-	
-</div>

view/templates/nets.tpl

@@ -1,11 +0,0 @@
-
-<div id="nets-sidebar" class="widget">
-	<h3>{{$title}}</h3>
-	<div id="nets-desc">{{$desc nofilter}}</div>
-	<a href="{{$base}}" class="nets-link{{if $sel_all}} nets-selected{{/if}} nets-all">{{$all}}</a>
-	<ul role="menu" class="nets-ul">
-	{{foreach $nets as $net}}
-	<li role="menuitem" ><a href="{{$base}}?nets={{$net.ref}}" class="nets-link{{if $net.selected}} nets-selected{{/if}}">{{$net.name}}</a></li>
-	{{/foreach}}
-	</ul>
-</div>

view/templates/widget/contacts.tpl

@@ -2,7 +2,7 @@
 <div id="contact-block">
 <h3 class="contact-block-h4">{{$contacts}}</h3>
 {{if $micropro}}
-		<a class="allcontact-link" href="viewcontacts/{{$nickname}}">{{$viewcontacts}}</a>
+		<a class="allcontact-link" href="profile/{{$nickname}}/contacts">{{$viewcontacts}}</a>
 		<div class='contact-block-content'>
 		{{foreach $micropro as $m}}
 			{{$m nofilter}}

view/templates/widget/filter.tpl

@@ -0,0 +1,11 @@
+
+<div id="{{$type}}-sidebar" class="widget">
+	<h3>{{$title}}</h3>
+	<div id="{{$type}}-desc">{{$desc nofilter}}</div>
+	<ul role="menu" class="{{$type}}-ul">
+		<li role="menuitem" {{if !$selected}}class="selected"{{/if}}><a href="{{$base}}" class="{{$type}}-link{{if !$selected}} {{$type}}-selected{{/if}} {{$type}}-all">{{$all_label}}</a></li>
+		{{foreach $options as $option}}
+			<li role="menuitem" {{if $selected == $option.ref}}class="selected"{{/if}}><a href="{{$base}}{{$type}}={{$option.ref}}" class="{{$type}}-link{{if $selected == $option.ref}} {{$type}}-selected{{/if}}">{{$option.name}}</a></li>
+		{{/foreach}}
+	</ul>
+</div>