Completed
Push — gcconnex ( ee5ffc...718fe4 )
by Ilia
09:37 queued 04:29
created
mod/wet4/views/default/page/layouts/elements/header.php 2 patches
Indentation   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -39,24 +39,24 @@
 block discarded – undo
39 39
 
40 40
 
41 41
 
42
-    //do not display main heading on discussion page
43
-    if($checkPage == 'group_profile'){
42
+	//do not display main heading on discussion page
43
+	if($checkPage == 'group_profile'){
44 44
 
45
-    } else if(elgg_in_context('dept_activity')){
45
+	} else if(elgg_in_context('dept_activity')){
46 46
 				echo '<h1 style="border-bottom:none;" class="panel-title mrgn-bttm-sm mrgn-tp-sm mrgn-lft-md">'.$title.'</h1>';
47 47
 		} else {
48
-        // @todo .elgg-heading-main supports action buttons - maybe rename class name?
49
-        if(elgg_get_page_owner_entity()){
50
-            if(elgg_get_page_owner_entity()->getType() == 'group'){
51
-                echo elgg_view('groups/profile/summaryBlock', $vars);
52
-                elgg_push_context('groupSubPage');
53
-                echo elgg_view('groups/profile/tab_menu');
54
-                elgg_pop_context();
55
-            }
56
-        }
48
+		// @todo .elgg-heading-main supports action buttons - maybe rename class name?
49
+		if(elgg_get_page_owner_entity()){
50
+			if(elgg_get_page_owner_entity()->getType() == 'group'){
51
+				echo elgg_view('groups/profile/summaryBlock', $vars);
52
+				elgg_push_context('groupSubPage');
53
+				echo elgg_view('groups/profile/tab_menu');
54
+				elgg_pop_context();
55
+			}
56
+		}
57 57
 	  		echo $buttons;
58
-        echo elgg_view_title($vars['title'], array('class' => 'elgg-heading-main mrgn-lft-sm'));
58
+		echo elgg_view_title($vars['title'], array('class' => 'elgg-heading-main mrgn-lft-sm'));
59 59
 
60
-    }
60
+	}
61 61
 
62 62
 }
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -40,14 +40,14 @@
 block discarded – undo
40 40
 
41 41
 
42 42
     //do not display main heading on discussion page
43
-    if($checkPage == 'group_profile'){
43
+    if ($checkPage == 'group_profile') {
44 44
 
45
-    } else if(elgg_in_context('dept_activity')){
46
-				echo '<h1 style="border-bottom:none;" class="panel-title mrgn-bttm-sm mrgn-tp-sm mrgn-lft-md">'.$title.'</h1>';
45
+    } else if (elgg_in_context('dept_activity')) {
46
+				echo '<h1 style="border-bottom:none;" class="panel-title mrgn-bttm-sm mrgn-tp-sm mrgn-lft-md">' . $title . '</h1>';
47 47
 		} else {
48 48
         // @todo .elgg-heading-main supports action buttons - maybe rename class name?
49
-        if(elgg_get_page_owner_entity()){
50
-            if(elgg_get_page_owner_entity()->getType() == 'group'){
49
+        if (elgg_get_page_owner_entity()) {
50
+            if (elgg_get_page_owner_entity()->getType() == 'group') {
51 51
                 echo elgg_view('groups/profile/summaryBlock', $vars);
52 52
                 elgg_push_context('groupSubPage');
53 53
                 echo elgg_view('groups/profile/tab_menu');
Please login to merge, or discard this patch.
mod/wet4/views/default/page/default.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -55,7 +55,7 @@
 block discarded – undo
55 55
 
56 56
 //WIP development banner
57 57
 if(elgg_is_active_plugin('GoC_dev_banner')){
58
-    $alert = elgg_view('banner/dev_banner');
58
+	$alert = elgg_view('banner/dev_banner');
59 59
 }
60 60
 /*
61 61
 if(elgg_instanceof(elgg_get_page_owner_entity(), 'group')){
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
 //elgg_echo('admin:plugins:label:version') . ': '
55 55
 
56 56
 //WIP development banner
57
-if(elgg_is_active_plugin('GoC_dev_banner')){
57
+if (elgg_is_active_plugin('GoC_dev_banner')) {
58 58
     $alert = elgg_view('banner/dev_banner');
59 59
 }
60 60
 /*
@@ -82,10 +82,10 @@  discard block
 block discarded – undo
82 82
 $userMenu = elgg_view('page/elements/topbar_wrapper', $vars);
83 83
 
84 84
 if (strstr(strtolower($_SERVER['HTTP_USER_AGENT']), 'gsa-crawler') === false) {
85
-	if(elgg_is_active_plugin('freshdesk_help')){
86
-		$feedback_link = elgg_get_site_url().'/help/knowledgebase';
85
+	if (elgg_is_active_plugin('freshdesk_help')) {
86
+		$feedback_link = elgg_get_site_url() . '/help/knowledgebase';
87 87
 	} else {
88
-		$feedback_link = elgg_get_site_url().'/mod/contactform';
88
+		$feedback_link = elgg_get_site_url() . '/mod/contactform';
89 89
 	}
90 90
 
91 91
 	$feedback_button = "<a href='{$feedback_link}' class='btn btn-primary'><span class='glyphicon glyphicon-comment mrgn-rght-sm'></span>{$feedbackText}</a>";
Please login to merge, or discard this patch.
mod/wet4/views/default/page/components/image_block.php 3 patches
Indentation   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -48,8 +48,8 @@  discard block
 block discarded – undo
48 48
 //elgg body appends the edit comment text box thing
49 49
 
50 50
 if (elgg_get_context() == 'messages'){
51
-    //tests to see if the image block is a message and don't display an image
52
-    // I tried to make the whole block a link but elgg doesn't like that :(
51
+	//tests to see if the image block is a message and don't display an image
52
+	// I tried to make the whole block a link but elgg doesn't like that :(
53 53
 $body = "<div class=\" mrgn-tp-sm col-sm-12\">$body</div>";
54 54
 
55 55
 if ($image) {
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
 	$alt_image = '<div class="elgg-image-alt  col-xs-1 mrgn-tp-md">' . $alt_image . '</div>';
87 87
 }
88 88
     
89
-    //see if entity is file or folder
89
+	//see if entity is file or folder
90 90
 $entity = elgg_extract('subtype', $vars, '');
91 91
 $guid = elgg_extract('guid', $vars, '');
92 92
 
@@ -95,10 +95,10 @@  discard block
 block discarded – undo
95 95
 
96 96
 //only display move link on files
97 97
 if($entity == 'file' && elgg_is_logged_in() && elgg_get_logged_in_user_entity()->canEdit()){
98
-    $body = '<div class="mrgn-tp-sm col-xs-9">' . $body . '</div>';
98
+	$body = '<div class="mrgn-tp-sm col-xs-9">' . $body . '</div>';
99 99
 } else {
100
-    $body = "<div class=\"mrgn-tp-sm col-xs-9\">$body</div>";
101
-    $move_link = '';
100
+	$body = "<div class=\"mrgn-tp-sm col-xs-9\">$body</div>";
101
+	$move_link = '';
102 102
 }
103 103
  
104 104
 
@@ -117,20 +117,20 @@  discard block
 block discarded – undo
117 117
 }else if($reshared == true){ //for reshared items
118 118
 
119 119
 
120
-    if(elgg_in_context('custom_index_widgets wire') || elgg_in_context('widgets')){
121
-        if ($image) {
122
-            $image = "<div class=\"mrgn-tp-sm col-xs-2\">$image</div>";        
123
-        }
124
-        $body = '<div class="col-xs-10">' . $body . '</div>';
125
-    } else {
126
-        if ($image) {
127
-            $image = "<div class=\"mrgn-tp-sm col-xs-1\">$image</div>";
128
-        }
129
-        $body = '<div class="col-xs-11">' . $body . '</div>';
130
-    }
120
+	if(elgg_in_context('custom_index_widgets wire') || elgg_in_context('widgets')){
121
+		if ($image) {
122
+			$image = "<div class=\"mrgn-tp-sm col-xs-2\">$image</div>";        
123
+		}
124
+		$body = '<div class="col-xs-10">' . $body . '</div>';
125
+	} else {
126
+		if ($image) {
127
+			$image = "<div class=\"mrgn-tp-sm col-xs-1\">$image</div>";
128
+		}
129
+		$body = '<div class="col-xs-11">' . $body . '</div>';
130
+	}
131 131
 
132 132
 
133
-    echo <<<HTML
133
+	echo <<<HTML
134 134
 
135 135
 <div class="$class clearfix mrgn-bttm-sm" $id>
136 136
 	$image$body
@@ -139,11 +139,11 @@  discard block
 block discarded – undo
139 139
 
140 140
 }else{
141 141
     
142
-    $body = "<div class=\"mrgn-tp-sm col-xs-10 noWrap\">$body</div>";
142
+	$body = "<div class=\"mrgn-tp-sm col-xs-10 noWrap\">$body</div>";
143 143
 
144 144
 if ($image) {
145 145
 	$image = "<div aria-hidden=\"true\" class=\"mrgn-tp-sm col-xs-2\">$image</div>";
146
-     //$echo = elgg_get_context();
146
+	 //$echo = elgg_get_context();
147 147
 }
148 148
 
149 149
 if ($alt_image) {
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
 
48 48
 //elgg body appends the edit comment text box thing
49 49
 
50
-if (elgg_get_context() == 'messages'){
50
+if (elgg_get_context() == 'messages') {
51 51
     //tests to see if the image block is a message and don't display an image
52 52
     // I tried to make the whole block a link but elgg doesn't like that :(
53 53
 $body = "<div class=\" mrgn-tp-sm col-sm-12\">$body</div>";
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
 HTML;
75 75
     
76 76
     
77
-}else if(elgg_in_context('file_tools_selector')){ //for files and folders
77
+} else if (elgg_in_context('file_tools_selector')) { //for files and folders
78 78
     
79 79
 
80 80
 
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
     
95 95
 
96 96
 //only display move link on files
97
-if($entity == 'file' && elgg_is_logged_in() && elgg_get_logged_in_user_entity()->canEdit()){
97
+if ($entity == 'file' && elgg_is_logged_in() && elgg_get_logged_in_user_entity()->canEdit()) {
98 98
     $body = '<div class="mrgn-tp-sm col-xs-9">' . $body . '</div>';
99 99
 } else {
100 100
     $body = "<div class=\"mrgn-tp-sm col-xs-9\">$body</div>";
@@ -114,10 +114,10 @@  discard block
 block discarded – undo
114 114
 </div>
115 115
 HTML;
116 116
 
117
-}else if($reshared == true){ //for reshared items
117
+} else if ($reshared == true) { //for reshared items
118 118
 
119 119
 
120
-    if(elgg_in_context('custom_index_widgets wire') || elgg_in_context('widgets')){
120
+    if (elgg_in_context('custom_index_widgets wire') || elgg_in_context('widgets')) {
121 121
         if ($image) {
122 122
             $image = "<div class=\"mrgn-tp-sm col-xs-2\">$image</div>";        
123 123
         }
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
137 137
 </div>
138 138
 HTML;
139 139
 
140
-}else{
140
+} else {
141 141
     
142 142
     $body = "<div class=\"mrgn-tp-sm col-xs-10 noWrap\">$body</div>";
143 143
 
Please login to merge, or discard this patch.
Braces   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
 HTML;
75 75
     
76 76
     
77
-}else if(elgg_in_context('file_tools_selector')){ //for files and folders
77
+} else if(elgg_in_context('file_tools_selector')){ //for files and folders
78 78
     
79 79
 
80 80
 
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
 </div>
115 115
 HTML;
116 116
 
117
-}else if($reshared == true){ //for reshared items
117
+} else if($reshared == true){ //for reshared items
118 118
 
119 119
 
120 120
     if(elgg_in_context('custom_index_widgets wire') || elgg_in_context('widgets')){
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
137 137
 </div>
138 138
 HTML;
139 139
 
140
-}else{
140
+} else{
141 141
     
142 142
     $body = "<div class=\"mrgn-tp-sm col-xs-10 noWrap\">$body</div>";
143 143
 
Please login to merge, or discard this patch.
mod/wet4/views/default/page/components/module.php 3 patches
Indentation   +97 added lines, -97 removed lines patch added patch discarded remove patch
@@ -34,10 +34,10 @@  discard block
 block discarded – undo
34 34
 $attrs = [
35 35
 	'id' => elgg_extract('id', $vars),
36 36
 	'class' => (array) elgg_extract('class', $vars, []),
37
-    //'item_class' => (array) elgg_extract('item_class', $vars, []),
38
-    'aria-grabbed' => elgg_extract('aria-grabbed', $vars), //this is for accessible drag and drop
39
-    'draggable' => elgg_extract('draggable', $vars),
40
-    'tabindex' => elgg_extract('tabindex', $vars),
37
+	//'item_class' => (array) elgg_extract('item_class', $vars, []),
38
+	'aria-grabbed' => elgg_extract('aria-grabbed', $vars), //this is for accessible drag and drop
39
+	'draggable' => elgg_extract('draggable', $vars),
40
+	'tabindex' => elgg_extract('tabindex', $vars),
41 41
 
42 42
 ];
43 43
 
@@ -50,122 +50,122 @@  discard block
 block discarded – undo
50 50
 
51 51
 if( $type == 'GPmod'){
52 52
 
53
-    if ($type) {
54
-        $attrs['class'][] = "elgg-module-$type";
55
-    }
53
+	if ($type) {
54
+		$attrs['class'][] = "elgg-module-$type";
55
+	}
56 56
 
57 57
 
58
-    $body = elgg_format_element('div', ['class' => 'clearfix'], $body);
59
-    if ($footer) {
60
-        $footer = elgg_format_element('div', ['class' => 'text-center panel-footer clearfix'], $footer);
61
-    }
58
+	$body = elgg_format_element('div', ['class' => 'clearfix'], $body);
59
+	if ($footer) {
60
+		$footer = elgg_format_element('div', ['class' => 'text-center panel-footer clearfix'], $footer);
61
+	}
62 62
 
63
-    $contents = $header . $body . $footer;
64
-    if ($show_inner) {
65
-        $contents = elgg_format_element('div', ['class' => 'elgg-inner'], $contents);
66
-    }
63
+	$contents = $header . $body . $footer;
64
+	if ($show_inner) {
65
+		$contents = elgg_format_element('div', ['class' => 'elgg-inner'], $contents);
66
+	}
67 67
 
68
-    echo elgg_format_element('div', $attrs, $contents);
68
+	echo elgg_format_element('div', $attrs, $contents);
69 69
 
70 70
 } else if ($checkPage =='gallery'){
71
-    // check to see if the page is a photo gallery to style the photo stuff :)
71
+	// check to see if the page is a photo gallery to style the photo stuff :)
72 72
 
73
-        $attrs['class'][] = 'panel panel-custom hght-inhrt ';
74
-    if ($type) {
75
-        $attrs['class'][] = "elgg-module-$type";
76
-    }
73
+		$attrs['class'][] = 'panel panel-custom hght-inhrt ';
74
+	if ($type) {
75
+		$attrs['class'][] = "elgg-module-$type";
76
+	}
77 77
 
78
-    $header = elgg_extract('header', $vars);
79
-    if ($title) {
80
-        $header = elgg_format_element('h4', ['class' => ''], $title);
81
-    }
78
+	$header = elgg_extract('header', $vars);
79
+	if ($title) {
80
+		$header = elgg_format_element('h4', ['class' => ''], $title);
81
+	}
82 82
 
83
-    if ($header !== null) {
84
-        $header = elgg_format_element('div', ['class' => 'panel-heading'], $header);
85
-    }
86
-    $body = elgg_format_element('div', ['class' => 'panel-body-gallery  clearfix'], $body);
87
-    if ($footer) {
88
-        $footer = elgg_format_element('div', ['class' => 'panel-body-gallery'], $footer);
89
-    }
83
+	if ($header !== null) {
84
+		$header = elgg_format_element('div', ['class' => 'panel-heading'], $header);
85
+	}
86
+	$body = elgg_format_element('div', ['class' => 'panel-body-gallery  clearfix'], $body);
87
+	if ($footer) {
88
+		$footer = elgg_format_element('div', ['class' => 'panel-body-gallery'], $footer);
89
+	}
90 90
 
91
-    $contents =  $body  .$footer ;
92
-    if ($show_inner) {
93
-        $contents = elgg_format_element('div', ['class' => 'elgg-inner'], $contents);
94
-    }
91
+	$contents =  $body  .$footer ;
92
+	if ($show_inner) {
93
+		$contents = elgg_format_element('div', ['class' => 'elgg-inner'], $contents);
94
+	}
95 95
 
96
-    echo elgg_format_element('div', $attrs, $contents);
96
+	echo elgg_format_element('div', $attrs, $contents);
97 97
 
98 98
 
99 99
 }else if(($type == 'tidypics-album-wet' && elgg_in_context('profile')) || ($type == 'tidypics-album-wet' && elgg_in_context('group_profile'))){ //Normal Style Below
100 100
 
101
-    if($checkPage =='custom_index_widgets'){
102
-        $attrs['class'][] = 'panel panel-default custom-index-panel';
103
-    }else{
104
-        $attrs['class'][] = 'panel panel-default TEST';
105
-    }
101
+	if($checkPage =='custom_index_widgets'){
102
+		$attrs['class'][] = 'panel panel-default custom-index-panel';
103
+	}else{
104
+		$attrs['class'][] = 'panel panel-default TEST';
105
+	}
106 106
 
107 107
 
108
-    if ($type) {
109
-        $attrs['class'][] = "elgg-module-$type";
110
-    }
108
+	if ($type) {
109
+		$attrs['class'][] = "elgg-module-$type";
110
+	}
111 111
 
112
-    $header = elgg_extract('header', $vars);
113
-    if ($title) {
114
-        //$header = elgg_format_element('h2', ['class' => 'panel-title'], gc_explode_translation($title,get_current_language()));
115
-        $header = elgg_format_element('h3', ['class' => 'panel-title'], $title);
116
-    }
112
+	$header = elgg_extract('header', $vars);
113
+	if ($title) {
114
+		//$header = elgg_format_element('h2', ['class' => 'panel-title'], gc_explode_translation($title,get_current_language()));
115
+		$header = elgg_format_element('h3', ['class' => 'panel-title'], $title);
116
+	}
117 117
 
118
-    if ($header !== null) {
119
-       // $header = elgg_format_element('div', ['class' => 'panel-heading'], $header);
120
-        $header = elgg_format_element('header', ['class' => 'panel-heading'], $header);
121
-    }
122
-    $body = elgg_format_element('div', ['class' => 'panel-body clearfix'], $body);
123
-    if ($footer) {
124
-        $footer = elgg_format_element('div', ['class' => 'panel-footer text-right'], $footer);
125
-    }
118
+	if ($header !== null) {
119
+	   // $header = elgg_format_element('div', ['class' => 'panel-heading'], $header);
120
+		$header = elgg_format_element('header', ['class' => 'panel-heading'], $header);
121
+	}
122
+	$body = elgg_format_element('div', ['class' => 'panel-body clearfix'], $body);
123
+	if ($footer) {
124
+		$footer = elgg_format_element('div', ['class' => 'panel-footer text-right'], $footer);
125
+	}
126 126
 
127
-    $contents = $header . $body . $footer;
128
-    if ($show_inner) {
129
-        $contents = elgg_format_element('div', ['class' => 'elgg-inner'], $contents);
130
-    }
127
+	$contents = $header . $body . $footer;
128
+	if ($show_inner) {
129
+		$contents = elgg_format_element('div', ['class' => 'elgg-inner'], $contents);
130
+	}
131 131
 
132
-    echo elgg_format_element('div', $attrs, $contents);
133
-    //echo $checkPage;
132
+	echo elgg_format_element('div', $attrs, $contents);
133
+	//echo $checkPage;
134 134
 
135 135
 } else { //Normal Style Below
136 136
 
137
-    if($checkPage =='custom_index_widgets'){
138
-        $attrs['class'][] = 'panel panel-default custom-index-panel';
139
-    }else{
140
-        $attrs['class'][] = 'panel panel-default TEST';
141
-    }
142
-
143
-
144
-    if ($type) {
145
-        $attrs['class'][] = "elgg-module-$type";
146
-    }
147
-
148
-    $header = elgg_extract('header', $vars);
149
-    if ($title) {
150
-        //$header = elgg_format_element('h2', ['class' => 'panel-title'], gc_explode_translation($title,get_current_language()));
151
-        $header = elgg_format_element('h2', ['class' => 'panel-title'], $title);
152
-    }
153
-
154
-    if ($header !== null) {
155
-       // $header = elgg_format_element('div', ['class' => 'panel-heading'], $header);
156
-        $header = elgg_format_element('header', ['class' => 'panel-heading'], $header);
157
-    }
158
-    $body = elgg_format_element('div', ['class' => 'panel-body clearfix'], $body);
159
-    if ($footer) {
160
-        $footer = elgg_format_element('div', ['class' => 'panel-footer text-right'], $footer);
161
-    }
162
-
163
-    $contents = $header . $body . $footer;
164
-    if ($show_inner) {
165
-        $contents = elgg_format_element('div', ['class' => 'elgg-inner'], $contents);
166
-    }
167
-
168
-    echo elgg_format_element('div', $attrs, $contents);
169
-    //echo $checkPage;
137
+	if($checkPage =='custom_index_widgets'){
138
+		$attrs['class'][] = 'panel panel-default custom-index-panel';
139
+	}else{
140
+		$attrs['class'][] = 'panel panel-default TEST';
141
+	}
142
+
143
+
144
+	if ($type) {
145
+		$attrs['class'][] = "elgg-module-$type";
146
+	}
147
+
148
+	$header = elgg_extract('header', $vars);
149
+	if ($title) {
150
+		//$header = elgg_format_element('h2', ['class' => 'panel-title'], gc_explode_translation($title,get_current_language()));
151
+		$header = elgg_format_element('h2', ['class' => 'panel-title'], $title);
152
+	}
153
+
154
+	if ($header !== null) {
155
+	   // $header = elgg_format_element('div', ['class' => 'panel-heading'], $header);
156
+		$header = elgg_format_element('header', ['class' => 'panel-heading'], $header);
157
+	}
158
+	$body = elgg_format_element('div', ['class' => 'panel-body clearfix'], $body);
159
+	if ($footer) {
160
+		$footer = elgg_format_element('div', ['class' => 'panel-footer text-right'], $footer);
161
+	}
162
+
163
+	$contents = $header . $body . $footer;
164
+	if ($show_inner) {
165
+		$contents = elgg_format_element('div', ['class' => 'elgg-inner'], $contents);
166
+	}
167
+
168
+	echo elgg_format_element('div', $attrs, $contents);
169
+	//echo $checkPage;
170 170
 
171 171
 }
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
  *
49 49
  */
50 50
 
51
-if( $type == 'GPmod'){
51
+if ($type == 'GPmod') {
52 52
 
53 53
     if ($type) {
54 54
         $attrs['class'][] = "elgg-module-$type";
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
 
68 68
     echo elgg_format_element('div', $attrs, $contents);
69 69
 
70
-} else if ($checkPage =='gallery'){
70
+} else if ($checkPage == 'gallery') {
71 71
     // check to see if the page is a photo gallery to style the photo stuff :)
72 72
 
73 73
         $attrs['class'][] = 'panel panel-custom hght-inhrt ';
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
         $footer = elgg_format_element('div', ['class' => 'panel-body-gallery'], $footer);
89 89
     }
90 90
 
91
-    $contents =  $body  .$footer ;
91
+    $contents = $body . $footer;
92 92
     if ($show_inner) {
93 93
         $contents = elgg_format_element('div', ['class' => 'elgg-inner'], $contents);
94 94
     }
@@ -96,11 +96,11 @@  discard block
 block discarded – undo
96 96
     echo elgg_format_element('div', $attrs, $contents);
97 97
 
98 98
 
99
-}else if(($type == 'tidypics-album-wet' && elgg_in_context('profile')) || ($type == 'tidypics-album-wet' && elgg_in_context('group_profile'))){ //Normal Style Below
99
+} else if (($type == 'tidypics-album-wet' && elgg_in_context('profile')) || ($type == 'tidypics-album-wet' && elgg_in_context('group_profile'))) { //Normal Style Below
100 100
 
101
-    if($checkPage =='custom_index_widgets'){
101
+    if ($checkPage == 'custom_index_widgets') {
102 102
         $attrs['class'][] = 'panel panel-default custom-index-panel';
103
-    }else{
103
+    } else {
104 104
         $attrs['class'][] = 'panel panel-default TEST';
105 105
     }
106 106
 
@@ -134,9 +134,9 @@  discard block
 block discarded – undo
134 134
 
135 135
 } else { //Normal Style Below
136 136
 
137
-    if($checkPage =='custom_index_widgets'){
137
+    if ($checkPage == 'custom_index_widgets') {
138 138
         $attrs['class'][] = 'panel panel-default custom-index-panel';
139
-    }else{
139
+    } else {
140 140
         $attrs['class'][] = 'panel panel-default TEST';
141 141
     }
142 142
 
Please login to merge, or discard this patch.
Braces   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -96,11 +96,11 @@  discard block
 block discarded – undo
96 96
     echo elgg_format_element('div', $attrs, $contents);
97 97
 
98 98
 
99
-}else if(($type == 'tidypics-album-wet' && elgg_in_context('profile')) || ($type == 'tidypics-album-wet' && elgg_in_context('group_profile'))){ //Normal Style Below
99
+} else if(($type == 'tidypics-album-wet' && elgg_in_context('profile')) || ($type == 'tidypics-album-wet' && elgg_in_context('group_profile'))){ //Normal Style Below
100 100
 
101 101
     if($checkPage =='custom_index_widgets'){
102 102
         $attrs['class'][] = 'panel panel-default custom-index-panel';
103
-    }else{
103
+    } else{
104 104
         $attrs['class'][] = 'panel panel-default TEST';
105 105
     }
106 106
 
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
136 136
 
137 137
     if($checkPage =='custom_index_widgets'){
138 138
         $attrs['class'][] = 'panel panel-default custom-index-panel';
139
-    }else{
139
+    } else{
140 140
         $attrs['class'][] = 'panel panel-default TEST';
141 141
     }
142 142
 
Please login to merge, or discard this patch.
mod/wet4/views/default/page/elements/message_dd_list.php 3 patches
Indentation   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -26,45 +26,45 @@
 block discarded – undo
26 26
 
27 27
 
28 28
 foreach ($items as $item) {
29
-    //Loop through the messages
29
+	//Loop through the messages
30 30
   $item_view = elgg_view_list_item($item, $vars);
31 31
   if (!$item_view) {
32
-    continue;
32
+	continue;
33 33
   }
34 34
 
35 35
 
36 36
   if ($item instanceof \ElggEntity) {
37
-    $guid = $item->getGUID();
38
-    $type = $item->getType();
39
-    $subtype = $item->getSubtype();
37
+	$guid = $item->getGUID();
38
+	$type = $item->getType();
39
+	$subtype = $item->getSubtype();
40 40
 
41
-    $li_attrs['id'] = "elgg-$type-$guid";
41
+	$li_attrs['id'] = "elgg-$type-$guid";
42 42
 
43
-    $li_attrs['class'][] = "elgg-item-$type";
44
-    if ($subtype) {
43
+	$li_attrs['class'][] = "elgg-item-$type";
44
+	if ($subtype) {
45 45
 
46
-      $li_attrs['class'][] = "elgg-item-$type-$subtype clearfix";
47
-    }
46
+	  $li_attrs['class'][] = "elgg-item-$type-$subtype clearfix";
47
+	}
48 48
   } else if (is_callable(array($item, 'getType'))) {
49
-    $li_attrs['id'] = "item-{$item->getType()}-{$item->id}";
49
+	$li_attrs['id'] = "item-{$item->getType()}-{$item->id}";
50 50
   }
51
-    //Get the elements of the message
51
+	//Get the elements of the message
52 52
   if(elgg_extract('metadata_name', $vars) == 'fromId'){
53
-      $heading1 = elgg_echo('msg:to');
54
-      $heading2 = elgg_echo('msg:sent');
55
-      $sender = get_entity($item->toId)->name;
56
-      $send_avatar = elgg_view_entity_icon(get_entity($item->toId), 'small');
53
+	  $heading1 = elgg_echo('msg:to');
54
+	  $heading2 = elgg_echo('msg:sent');
55
+	  $sender = get_entity($item->toId)->name;
56
+	  $send_avatar = elgg_view_entity_icon(get_entity($item->toId), 'small');
57 57
   } else {
58
-      $heading1 = elgg_echo('msg:from');
59
-      $heading2 = elgg_echo('msg:recieved');
60
-      $sender = get_entity($item->fromId)->name;
61
-      $send_avatar = elgg_view_entity_icon(get_entity($item->fromId), 'small');
58
+	  $heading1 = elgg_echo('msg:from');
59
+	  $heading2 = elgg_echo('msg:recieved');
60
+	  $sender = get_entity($item->fromId)->name;
61
+	  $send_avatar = elgg_view_entity_icon(get_entity($item->fromId), 'small');
62 62
   }
63 63
 
64 64
   $subject_info = elgg_view('output/url', array(
65
-    'href' => $item->getURL(),
66
-    'text' => $item->title,
67
-    'is_trusted' => true,
65
+	'href' => $item->getURL(),
66
+	'text' => $item->title,
67
+	'is_trusted' => true,
68 68
   ));
69 69
 
70 70
 
Please login to merge, or discard this patch.
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
     $li_attrs['id'] = "item-{$item->getType()}-{$item->id}";
50 50
   }
51 51
     //Get the elements of the message
52
-  if(elgg_extract('metadata_name', $vars) == 'fromId'){
52
+  if (elgg_extract('metadata_name', $vars) == 'fromId') {
53 53
       $heading1 = elgg_echo('msg:to');
54 54
       $heading2 = elgg_echo('msg:sent');
55 55
       $sender = get_entity($item->toId)->name;
@@ -68,17 +68,17 @@  discard block
 block discarded – undo
68 68
   ));
69 69
 
70 70
 
71
-if($dd_type =='msg_dd'){ //Test for messages
72
-  $name_and_time = '<div class="col-sm-12 clearfix"><div class="col-sm-2">'.$send_avatar.'</div><div class="col-sm-10"><div class="col-sm-12">'.$sender.'</div><div class="col-sm-12">'.elgg_view_friendly_time($item->time_created).'</div></div></div>';
73
-  $message_title = '<div class="col-sm-12 mrgn-tp-sm clearfix message-dd-title">'.$subject_info.'</div>';
71
+if ($dd_type == 'msg_dd') { //Test for messages
72
+  $name_and_time = '<div class="col-sm-12 clearfix"><div class="col-sm-2">' . $send_avatar . '</div><div class="col-sm-10"><div class="col-sm-12">' . $sender . '</div><div class="col-sm-12">' . elgg_view_friendly_time($item->time_created) . '</div></div></div>';
73
+  $message_title = '<div class="col-sm-12 mrgn-tp-sm clearfix message-dd-title">' . $subject_info . '</div>';
74 74
   $message_final = $name_and_time . $message_title;
75 75
 
76
-}else if ($dd_type =='notif_dd'){ //Test for notifcations
77
-$message_title = '<div class="col-sm-12 mrgn-tp-sm clearfix">'.$subject_info.'</div>';
78
-$name_and_time = '<div class="col-sm-12">'.elgg_view_friendly_time($item->time_created).'</div>';
79
-$message_final =  $message_title . $name_and_time;
76
+} else if ($dd_type == 'notif_dd') { //Test for notifcations
77
+$message_title = '<div class="col-sm-12 mrgn-tp-sm clearfix">' . $subject_info . '</div>';
78
+$name_and_time = '<div class="col-sm-12">' . elgg_view_friendly_time($item->time_created) . '</div>';
79
+$message_final = $message_title . $name_and_time;
80 80
 }
81 81
 //Format the div element
82
-echo elgg_format_element('div',  array('class'=>'list-break message-dd-block mrgn-bttm-sm clearfix',), $message_final);
82
+echo elgg_format_element('div', array('class'=>'list-break message-dd-block mrgn-bttm-sm clearfix',), $message_final);
83 83
 }
84 84
 ?>
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -73,7 +73,7 @@
 block discarded – undo
73 73
   $message_title = '<div class="col-sm-12 mrgn-tp-sm clearfix message-dd-title">'.$subject_info.'</div>';
74 74
   $message_final = $name_and_time . $message_title;
75 75
 
76
-}else if ($dd_type =='notif_dd'){ //Test for notifcations
76
+} else if ($dd_type =='notif_dd'){ //Test for notifcations
77 77
 $message_title = '<div class="col-sm-12 mrgn-tp-sm clearfix">'.$subject_info.'</div>';
78 78
 $name_and_time = '<div class="col-sm-12">'.elgg_view_friendly_time($item->time_created).'</div>';
79 79
 $message_final =  $message_title . $name_and_time;
Please login to merge, or discard this patch.
mod/wet4/views/default/page/elements/chng-lang.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@
 block discarded – undo
18 18
         <h2 class="wb-inv"><?php echo elgg_echo('wet:LangSel')?></h2>
19 19
             <div class="col-md-12">
20 20
                 <ul class="list-inline margin-bottom-none">
21
-                    <li><?php echo elgg_view('toggle_language/toggle_lang');?></li>
21
+                    <li><?php echo elgg_view('toggle_language/toggle_lang'); ?></li>
22 22
                 </ul>
23 23
             </div>
24 24
     </section>
Please login to merge, or discard this patch.
mod/wet4/views/default/page/elements/gsa_view_start.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@
 block discarded – undo
1 1
 <?php
2
-if (elgg_is_active_plugin('gc_fedsearch_gsa') && ((!$gsa_usertest) && strcmp($gsa_agentstring,strtolower($_SERVER['HTTP_USER_AGENT'])) == 0) || strstr(strtolower($_SERVER['HTTP_USER_AGENT']), 'gsa-crawler') !== false )
2
+if (elgg_is_active_plugin('gc_fedsearch_gsa') && ((!$gsa_usertest) && strcmp($gsa_agentstring, strtolower($_SERVER['HTTP_USER_AGENT'])) == 0) || strstr(strtolower($_SERVER['HTTP_USER_AGENT']), 'gsa-crawler') !== false)
3 3
 	$css = "style='display:none;'";
4 4
 else 
5 5
 	$css = "";
Please login to merge, or discard this patch.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,8 +1,9 @@
 block discarded – undo
1 1
 <?php
2
-if (elgg_is_active_plugin('gc_fedsearch_gsa') && ((!$gsa_usertest) && strcmp($gsa_agentstring,strtolower($_SERVER['HTTP_USER_AGENT'])) == 0) || strstr(strtolower($_SERVER['HTTP_USER_AGENT']), 'gsa-crawler') !== false )
2
+if (elgg_is_active_plugin('gc_fedsearch_gsa') && ((!$gsa_usertest) && strcmp($gsa_agentstring,strtolower($_SERVER['HTTP_USER_AGENT'])) == 0) || strstr(strtolower($_SERVER['HTTP_USER_AGENT']), 'gsa-crawler') !== false ) {
3 3
 	$css = "style='display:none;'";
4
-else 
4
+} else {
5 5
 	$css = "";
6
+}
6 7
 ?>
7 8
 
8 9
 <div class='let_crawler_know_to_ignore_this' <?php echo $css ?>>
9 10
\ No newline at end of file
Please login to merge, or discard this patch.
mod/wet4/views/default/page/elements/login_menu.php 2 patches
Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -249,12 +249,12 @@  discard block
 block discarded – undo
249 249
             <div class="form-group">
250 250
           	   <label for='username'><?php echo elgg_echo('loginusername'); ?></label>
251 251
           	<?php echo elgg_view('input/text', array(
252
-          		        'name' => 'username',
253
-                      'placeholder' => elgg_echo('loginusername'),
254
-                      'id' => 'username',
255
-                      'class' => 'form-control',
256
-          		      ));
257
-          	?>
252
+		  				'name' => 'username',
253
+					  'placeholder' => elgg_echo('loginusername'),
254
+					  'id' => 'username',
255
+					  'class' => 'form-control',
256
+		  			  ));
257
+		  	?>
258 258
           </div>
259 259
           <div class="form-group">
260 260
           	<label for='password'><?php echo elgg_echo('password'); ?></label>
@@ -270,10 +270,10 @@  discard block
 block discarded – undo
270 270
           	</label>
271 271
           </div>
272 272
           	<?php
273
-            echo elgg_view('input/submit', array('value' => elgg_echo('login'), 'class' => 'btn-primary'));
274
-          	echo elgg_view('input/hidden', array('name' => 'returntoreferer', 'value' => 'true'));
275
-            echo '<a href="' . $site_url . 'forgotpassword" class="col-xs-12 mrgn-tp-md">'.elgg_echo('user:forgot').'</a>';
276
-            ?>
273
+			echo elgg_view('input/submit', array('value' => elgg_echo('login'), 'class' => 'btn-primary'));
274
+		  	echo elgg_view('input/hidden', array('name' => 'returntoreferer', 'value' => 'true'));
275
+			echo '<a href="' . $site_url . 'forgotpassword" class="col-xs-12 mrgn-tp-md">'.elgg_echo('user:forgot').'</a>';
276
+			?>
277 277
           </form>
278 278
 
279 279
         </div>
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -237,7 +237,7 @@  discard block
 block discarded – undo
237 237
   <div id="topnav">
238 238
     <div class="active-links">
239 239
         <div id="session">
240
-          <?php if (get_context() != 'login'){ ?>
240
+          <?php if (get_context() != 'login') { ?>
241 241
           <a id="signin-link" href="#" style='text-decoration:none;'><strong><span id="login_focus"><?php echo elgg_echo('login'); ?></span>  |</strong></a>
242 242
           <strong><a  href=" <?php echo $site_url; ?>register">  <?php echo elgg_echo('register'); ?></a></li></strong>
243 243
           <?php } ?>
@@ -245,7 +245,7 @@  discard block
 block discarded – undo
245 245
 
246 246
         <div id="signin-dropdown" class='login-menu'>
247 247
 
248
-          <form method="post" role="form" action="<?php echo elgg_add_action_tokens_to_url($site_url.'action/login'); ?>">
248
+          <form method="post" role="form" action="<?php echo elgg_add_action_tokens_to_url($site_url . 'action/login'); ?>">
249 249
             <div class="form-group">
250 250
           	   <label for='username'><?php echo elgg_echo('loginusername'); ?></label>
251 251
           	<?php echo elgg_view('input/text', array(
@@ -272,7 +272,7 @@  discard block
 block discarded – undo
272 272
           	<?php
273 273
             echo elgg_view('input/submit', array('value' => elgg_echo('login'), 'class' => 'btn-primary'));
274 274
           	echo elgg_view('input/hidden', array('name' => 'returntoreferer', 'value' => 'true'));
275
-            echo '<a href="' . $site_url . 'forgotpassword" class="col-xs-12 mrgn-tp-md">'.elgg_echo('user:forgot').'</a>';
275
+            echo '<a href="' . $site_url . 'forgotpassword" class="col-xs-12 mrgn-tp-md">' . elgg_echo('user:forgot') . '</a>';
276 276
             ?>
277 277
           </form>
278 278
 
Please login to merge, or discard this patch.
mod/wet4/views/default/page/elements/topbar_wrapper.php 1 patch
Indentation   +4 added lines, -6 removed lines patch added patch discarded remove patch
@@ -15,16 +15,14 @@  discard block
 block discarded – undo
15 15
 		?>
16 16
 	</div>
17 17
 </div>
18
- 
19
- 
20 18
  * GC_MODIFICATION
21 19
  * Description: Replaced topbar with user menu
22 20
  */
23 21
 
24 22
 if (!elgg_is_logged_in()) {
25
-    echo '<nav role="navigation" class="text-right col-md-12 mrgn-tp-sm user-z-index">';
26
-    echo elgg_view('page/elements/login_menu', $vars);
27
-    echo '</nav>';
23
+	echo '<nav role="navigation" class="text-right col-md-12 mrgn-tp-sm user-z-index">';
24
+	echo elgg_view('page/elements/login_menu', $vars);
25
+	echo '</nav>';
28 26
     
29 27
 	//return true;
30 28
 } else {
@@ -34,7 +32,7 @@  discard block
 block discarded – undo
34 32
 <nav role="navigation" class="text-right col-md-12 mrgn-tp-sm user-z-index">
35 33
     <h2 class="wb-invisible"><?php echo elgg_echo('wet:usermenu:helpertext'); ?></h2>
36 34
     <?php
37
-        //echo elgg_view('page/elements/topbar', $vars);
35
+		//echo elgg_view('page/elements/topbar', $vars);
38 36
 		echo elgg_view('page/elements/user_menu', $vars);
39 37
 		?>
40 38
 </nav>
Please login to merge, or discard this patch.