From b341732f3a4a7f5d4821db5909d37e9e29d95dc3 Mon Sep 17 00:00:00 2001
From: harukin <harukin0731@gmail.com>
Date: Fri, 16 Nov 2018 17:57:20 +0900
Subject: [PATCH]

---
 .../plusfuture/php/widget_userlogomenu.php    | 37 ++++++++++++-------
 view/theme/plusfuture/tpl/userlogomenu.tpl    | 12 +++---
 2 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/view/theme/plusfuture/php/widget_userlogomenu.php b/view/theme/plusfuture/php/widget_userlogomenu.php
index 431c98f..6c1ef2c 100644
--- a/view/theme/plusfuture/php/widget_userlogomenu.php
+++ b/view/theme/plusfuture/php/widget_userlogomenu.php
@@ -3,21 +3,10 @@
 namespace Zotlabs\Widget;
 
 use Zotlabs\Lib\Apps;
-function widget_userlogomenu($args) {
 
-    $channel = channelx_by_n(\App::$profile_uid);
+class widget_userlogomenu {
 
-    $o = replace_macros(get_markup_template('userlogomenu.tpl'), array(
-      '$sitelocation' => $site['$sitelocation'],
-      '$banner' => $channel['channel_name'],
-      '$channel' => $channel['channel_address'],
-      '$avatar' => $channel['xchan_photo_s'],
-    ));
-
-  return $o;
-
-  }
-  function widget($arr) {
+	function widget($arr) {
 
 		if(! local_channel())
 			return '';
@@ -213,4 +202,24 @@ function widget_userlogomenu($args) {
 
 		return $o;
 
-	}
\ No newline at end of file
+  }
+function widget_userlogomenu($args) {
+
+    $channel = channelx_by_n(\App::$profile_uid);
+
+    $o = replace_macros(get_markup_template('userlogomenu.tpl'), array(
+      '$sitelocation' => $site['$sitelocation'],
+      '$banner' => $channel['channel_name'],
+      '$channel' => $channel['channel_address'],
+      '$avatar' => $channel['xchan_photo_s'],
+    ));
+
+  return $o;
+
+  }
+
+
+
+  
+
+}
diff --git a/view/theme/plusfuture/tpl/userlogomenu.tpl b/view/theme/plusfuture/tpl/userlogomenu.tpl
index 8037110..06c8df0 100644
--- a/view/theme/plusfuture/tpl/userlogomenu.tpl
+++ b/view/theme/plusfuture/tpl/userlogomenu.tpl
@@ -67,7 +67,12 @@
           <p>利用規約</p>
         </a>
       </li>
-      <div class="widget">
+  </ul>
+
+  </div>
+
+
+<div class="widget">
 	<h3 class="d-flex justify-content-between align-items-center">
 		{{$title}}
 		{{if $reset}}
@@ -92,8 +97,3 @@
 	</script>
 	{{/if}}
 </div>
-
-  </ul>
-
-  </div>
-