Completed
Push — gcconnex ( ee5ffc...718fe4 )
by Ilia
09:37 queued 04:29
created
mod/wet4/views/default/js/event_calendar/fullcalendar.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@
 block discarded – undo
16 16
 	
17 17
 ;;
18 18
 
19
-<?php if ( elgg_echo("fr") == "French" ){ ?>
19
+<?php if (elgg_echo("fr") == "French") { ?>
20 20
 	// English defaults
21 21
 	var defaults = {
22 22
 
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -94,8 +94,7 @@
 block discarded – undo
94 94
 		handleWindowResize: true
95 95
 		
96 96
 	};
97
-<?php }
98
-else { ?>
97
+<?php } else { ?>
99 98
 	// French defaults
100 99
 	var defaults = {
101 100
 
Please login to merge, or discard this patch.
mod/wet4/views/default/resources/activity_tabs/activity_tabs.php 2 patches
Switch Indentation   +37 added lines, -37 removed lines patch added patch discarded remove patch
@@ -38,44 +38,44 @@
 block discarded – undo
38 38
 }
39 39
 
40 40
 switch ($page_type) {
41
-	case 'user':
42
-		$title = elgg_echo('activity_tabs:user');
43
-		$page_filter = 'activity_tab';
44
-
45
-		$options['subject_guid'] = $id;
46
-		break;
47
-	case 'group':
48
-		$db_prefix = elgg_get_config('dbprefix');
49
-		$title = elgg_echo('activity_tabs:group');
50
-		$page_filter = 'activity_tab';
51
-		$options['joins'] = array("JOIN {$db_prefix}entities e ON e.guid = rv.object_guid");
52
-		$options['wheres'] = array("e.container_guid = $id");
53
-		break;
54
-	case 'mydept':
55
-		$title = elgg_echo('activity_tabs:collection');
56
-		$page_filter = 'activity_tab';
41
+		case 'user':
42
+			$title = elgg_echo('activity_tabs:user');
43
+			$page_filter = 'activity_tab';
44
+
45
+			$options['subject_guid'] = $id;
46
+			break;
47
+		case 'group':
48
+			$db_prefix = elgg_get_config('dbprefix');
49
+			$title = elgg_echo('activity_tabs:group');
50
+			$page_filter = 'activity_tab';
51
+			$options['joins'] = array("JOIN {$db_prefix}entities e ON e.guid = rv.object_guid");
52
+			$options['wheres'] = array("e.container_guid = $id");
53
+			break;
54
+		case 'mydept':
55
+			$title = elgg_echo('activity_tabs:collection');
56
+			$page_filter = 'activity_tab';
57 57
 		
58
-		$db_prefix = elgg_get_config('dbprefix');
59
-		$dept = elgg_get_logged_in_user_entity()->department;
60
-		$options['joins'] = array("INNER JOIN {$db_prefix}metadata md ON md.entity_guid = rv.subject_guid LEFT JOIN {$db_prefix}metastrings msn ON md.name_id = msn.id LEFT JOIN {$db_prefix}metastrings msv ON md.value_id = msv.id");	// we need this to filter by metadata
61
-		$options['wheres'] = array("msn.string = \"department\" AND msv.string LIKE \"{$dept}\"");
62
-		break;
63
-	case 'otherdept':
64
-		$title = elgg_echo('activity_tabs:collection');
65
-		$page_filter = 'activity_tab';
66
-
67
-		$db_prefix = elgg_get_config('dbprefix');
68
-		$dept = elgg_get_logged_in_user_entity()->department;
69
-		$options['joins'] = array("INNER JOIN {$db_prefix}metadata md ON md.entity_guid = rv.subject_guid LEFT JOIN {$db_prefix}metastrings msn ON md.name_id = msn.id LEFT JOIN {$db_prefix}metastrings msv ON md.value_id = msv.id");	// we need this to filter by metadata
70
-		$options['wheres'] = array("msn.string = \"department\" AND msv.string NOT LIKE \"{$dept}\"");
71
-		break;
72
-	case 'collection':
73
-	default:
74
-		$title = elgg_echo('activity_tabs:collection');
75
-		$page_filter = 'activity_tab';
76
-
77
-		$options['subject_guid'] = $members;
78
-		break;
58
+			$db_prefix = elgg_get_config('dbprefix');
59
+			$dept = elgg_get_logged_in_user_entity()->department;
60
+			$options['joins'] = array("INNER JOIN {$db_prefix}metadata md ON md.entity_guid = rv.subject_guid LEFT JOIN {$db_prefix}metastrings msn ON md.name_id = msn.id LEFT JOIN {$db_prefix}metastrings msv ON md.value_id = msv.id");	// we need this to filter by metadata
61
+			$options['wheres'] = array("msn.string = \"department\" AND msv.string LIKE \"{$dept}\"");
62
+			break;
63
+		case 'otherdept':
64
+			$title = elgg_echo('activity_tabs:collection');
65
+			$page_filter = 'activity_tab';
66
+
67
+			$db_prefix = elgg_get_config('dbprefix');
68
+			$dept = elgg_get_logged_in_user_entity()->department;
69
+			$options['joins'] = array("INNER JOIN {$db_prefix}metadata md ON md.entity_guid = rv.subject_guid LEFT JOIN {$db_prefix}metastrings msn ON md.name_id = msn.id LEFT JOIN {$db_prefix}metastrings msv ON md.value_id = msv.id");	// we need this to filter by metadata
70
+			$options['wheres'] = array("msn.string = \"department\" AND msv.string NOT LIKE \"{$dept}\"");
71
+			break;
72
+		case 'collection':
73
+		default:
74
+			$title = elgg_echo('activity_tabs:collection');
75
+			$page_filter = 'activity_tab';
76
+
77
+			$options['subject_guid'] = $members;
78
+			break;
79 79
 }
80 80
 
81 81
 $options['no_results'] = elgg_echo('river:none');
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
 		
58 58
 		$db_prefix = elgg_get_config('dbprefix');
59 59
 		$dept = elgg_get_logged_in_user_entity()->department;
60
-		$options['joins'] = array("INNER JOIN {$db_prefix}metadata md ON md.entity_guid = rv.subject_guid LEFT JOIN {$db_prefix}metastrings msn ON md.name_id = msn.id LEFT JOIN {$db_prefix}metastrings msv ON md.value_id = msv.id");	// we need this to filter by metadata
60
+		$options['joins'] = array("INNER JOIN {$db_prefix}metadata md ON md.entity_guid = rv.subject_guid LEFT JOIN {$db_prefix}metastrings msn ON md.name_id = msn.id LEFT JOIN {$db_prefix}metastrings msv ON md.value_id = msv.id"); // we need this to filter by metadata
61 61
 		$options['wheres'] = array("msn.string = \"department\" AND msv.string LIKE \"{$dept}\"");
62 62
 		break;
63 63
 	case 'otherdept':
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
 
67 67
 		$db_prefix = elgg_get_config('dbprefix');
68 68
 		$dept = elgg_get_logged_in_user_entity()->department;
69
-		$options['joins'] = array("INNER JOIN {$db_prefix}metadata md ON md.entity_guid = rv.subject_guid LEFT JOIN {$db_prefix}metastrings msn ON md.name_id = msn.id LEFT JOIN {$db_prefix}metastrings msv ON md.value_id = msv.id");	// we need this to filter by metadata
69
+		$options['joins'] = array("INNER JOIN {$db_prefix}metadata md ON md.entity_guid = rv.subject_guid LEFT JOIN {$db_prefix}metastrings msn ON md.name_id = msn.id LEFT JOIN {$db_prefix}metastrings msv ON md.value_id = msv.id"); // we need this to filter by metadata
70 70
 		$options['wheres'] = array("msn.string = \"department\" AND msv.string NOT LIKE \"{$dept}\"");
71 71
 		break;
72 72
 	case 'collection':
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
 
86 86
 $html = elgg_view('widgets/most_liked/content');
87 87
 
88
-$sidebar = elgg_view_module('aside', elgg_echo('activity:module:weekly_likes'), $html);//elgg_view('core/river/sidebar');
88
+$sidebar = elgg_view_module('aside', elgg_echo('activity:module:weekly_likes'), $html); //elgg_view('core/river/sidebar');
89 89
 
90 90
 $params = array(
91 91
 	'content' => $content . $activity,
Please login to merge, or discard this patch.
mod/wet4/views/default/discussion/replies.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@  discard block
 block discarded – undo
6 6
  * @uses $vars['show_add_form'] Display add form or not
7 7
  */
8 8
 
9
-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 ) {
9
+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) {
10 10
 	
11 11
 } else {
12 12
 
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 	 echo '<div id="group-replies" class="elgg-comments mrgn-rght-md mrgn-lft-md clearfix">';
35 35
 
36 36
 	 // if topic has replies show replies header
37
-	 if($num_replies != 0)
37
+	 if ($num_replies != 0)
38 38
 		 echo '<h2 class="panel-title mrgn-lft-sm mrgn-bttm-md mrgn-tp-md">' . elgg_echo('group:replies') . '</h2>';
39 39
 	 
40 40
 
Please login to merge, or discard this patch.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -34,8 +34,9 @@
 block discarded – undo
34 34
 	 echo '<div id="group-replies" class="elgg-comments mrgn-rght-md mrgn-lft-md clearfix">';
35 35
 
36 36
 	 // if topic has replies show replies header
37
-	 if($num_replies != 0)
38
-		 echo '<h2 class="panel-title mrgn-lft-sm mrgn-bttm-md mrgn-tp-md">' . elgg_echo('group:replies') . '</h2>';
37
+	 if($num_replies != 0) {
38
+	 		 echo '<h2 class="panel-title mrgn-lft-sm mrgn-bttm-md mrgn-tp-md">' . elgg_echo('group:replies') . '</h2>';
39
+	 }
39 40
 	 
40 41
 
41 42
 	 echo $replies;
Please login to merge, or discard this patch.
mod/wet4/views/default/wet4_theme/custom_css.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
11 11
 
12 12
 $site_url = elgg_get_site_url();
13 13
 
14
-$gsa_pagination = elgg_get_plugin_setting('gsa_pagination','gc_fedsearch_gsa');
14
+$gsa_pagination = elgg_get_plugin_setting('gsa_pagination', 'gc_fedsearch_gsa');
15 15
 
16 16
 ?>
17 17
 /* <style> /**/
@@ -683,7 +683,7 @@  discard block
 block discarded – undo
683 683
     }
684 684
 
685 685
     .login-engage-bg{
686
-        background-image: url("<?php echo $site_url.'mod/wet4/graphics/gcconnex_icon_transp.png'?>");
686
+        background-image: url("<?php echo $site_url . 'mod/wet4/graphics/gcconnex_icon_transp.png'?>");
687 687
         background-repeat: no-repeat;
688 688
         background-size:contain;
689 689
         background-position: center center;
@@ -1281,7 +1281,7 @@  discard block
 block discarded – undo
1281 1281
         #cboxLoadedContent{margin-bottom:20px; padding: 35px;}
1282 1282
         #cboxTitle{position:absolute; bottom:0px; left:0; text-align:center; width:100%; color:#999;}
1283 1283
         #cboxCurrent{position:absolute; bottom:0px; left:100px; color:#999;}
1284
-        #cboxLoadingOverlay{background:#fff url(<?php echo $site_url.'vendors/jquery/colorbox/theme/images/loading.gif';?>) no-repeat center center;}
1284
+        #cboxLoadingOverlay{background:#fff url(<?php echo $site_url . 'vendors/jquery/colorbox/theme/images/loading.gif'; ?>) no-repeat center center;}
1285 1285
 
1286 1286
         /* these elements are buttons, and may need to have additional styles reset to avoid unwanted base styles */
1287 1287
         #cboxPrevious, #cboxNext, #cboxSlideshow, #cboxClose {border:0; padding:0; margin:0; overflow:visible; width:auto; background:none; }
Please login to merge, or discard this patch.
mod/wet4/views/default/page/layouts/content.php 3 patches
Indentation   +40 added lines, -40 removed lines patch added patch discarded remove patch
@@ -40,38 +40,38 @@  discard block
 block discarded – undo
40 40
 
41 41
 	// generate a list of default tabs
42 42
     
43
-        if((elgg_get_context() == 'blog'))  {
44
-        $tabs = array(
45
-            'all' => array(
46
-                'text' => elgg_echo('all'),
47
-                'href' => (isset($vars['all_link'])) ? $vars['all_link'] : "$context/all",
48
-                'selected' => ($filter_context == 'all'),
49
-                'priority' => 200,
50
-            ),
51
-            'mine' => array(
52
-                'text' => elgg_echo('blog:mine'),
53
-                'href' => (isset($vars['mine_link'])) ? $vars['mine_link'] : "$context/owner/$username",
54
-                'selected' => ($filter_context == 'mine'),
55
-                'priority' => 300,
56
-            ),
57
-            'champions' => array(
58
-                'text' => elgg_echo('friends'), //GCconnex Champions
59
-                'href' => (isset($vars['friend_link'])) ? $vars['friend_link'] : "$context/friends/$username",
60
-                'selected' => ($filter_context == 'friends'),
61
-                'priority' => 400,
62
-            ),/*Hide for now
43
+		if((elgg_get_context() == 'blog'))  {
44
+		$tabs = array(
45
+			'all' => array(
46
+				'text' => elgg_echo('all'),
47
+				'href' => (isset($vars['all_link'])) ? $vars['all_link'] : "$context/all",
48
+				'selected' => ($filter_context == 'all'),
49
+				'priority' => 200,
50
+			),
51
+			'mine' => array(
52
+				'text' => elgg_echo('blog:mine'),
53
+				'href' => (isset($vars['mine_link'])) ? $vars['mine_link'] : "$context/owner/$username",
54
+				'selected' => ($filter_context == 'mine'),
55
+				'priority' => 300,
56
+			),
57
+			'champions' => array(
58
+				'text' => elgg_echo('friends'), //GCconnex Champions
59
+				'href' => (isset($vars['friend_link'])) ? $vars['friend_link'] : "$context/friends/$username",
60
+				'selected' => ($filter_context == 'friends'),
61
+				'priority' => 400,
62
+			),/*Hide for now
63 63
             'authors' => array(
64 64
                 'text' => elgg_echo('My favorite Authors'),
65 65
                 'href' => "activity/blog",
66 66
                 'selected' => ($filter_context == 'sharemaps'),
67 67
                 'priority' => 500,
68 68
             ),*/
69
-        );
69
+		);
70 70
         
71
-        } else if((elgg_get_context() == 'thewire')){
72
-            //changing the tabs in the wire to add 'mentioned'
73
-            if($user = elgg_get_logged_in_user_entity()){
74
-                      $tabs = array(
71
+		} else if((elgg_get_context() == 'thewire')){
72
+			//changing the tabs in the wire to add 'mentioned'
73
+			if($user = elgg_get_logged_in_user_entity()){
74
+					  $tabs = array(
75 75
 		'all' => array(
76 76
 			'text' => elgg_echo('all'),
77 77
 			'href' => (isset($vars['all_link'])) ? $vars['all_link'] : "$context/all",
@@ -90,23 +90,23 @@  discard block
 block discarded – undo
90 90
 			'selected' => ($filter_context == 'friends'),
91 91
 			'priority' => 400,
92 92
 		),
93
-        'mention' => array(
94
-            'text' => 'Mentions',
95
-            "href" => "thewire/search/@" . $user->username,
96
-            "text" => elgg_echo("thewire_tools:menu:mentions"),
97
-            "context" => "thewire",
98
-            'priority' => 500,
99
-            ),
100
-        );  
101
-            }
93
+		'mention' => array(
94
+			'text' => 'Mentions',
95
+			"href" => "thewire/search/@" . $user->username,
96
+			"text" => elgg_echo("thewire_tools:menu:mentions"),
97
+			"context" => "thewire",
98
+			'priority' => 500,
99
+			),
100
+		);  
101
+			}
102 102
 
103 103
             
104 104
             
105
-        }else if((elgg_get_context() == 'friend')){
106
-            $tabs = elgg_view_menu('page', array('sort_by' => 'name'));
107
-            //echo elgg_view_menu('page', array('sort_by' => 'name'));
108
-            //echo '<div>Maybe Im stoopid?</div>';
109
-        }else{
105
+		}else if((elgg_get_context() == 'friend')){
106
+			$tabs = elgg_view_menu('page', array('sort_by' => 'name'));
107
+			//echo elgg_view_menu('page', array('sort_by' => 'name'));
108
+			//echo '<div>Maybe Im stoopid?</div>';
109
+		}else{
110 110
     
111 111
 	$tabs = array(
112 112
 		'all' => array(
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
 			'priority' => 400,
129 129
 		),
130 130
 	);
131
-        }
131
+		}
132 132
 
133 133
 	foreach ($tabs as $name => $tab) {
134 134
 		$tab['name'] = $name;
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
 
41 41
 	// generate a list of default tabs
42 42
     
43
-        if((elgg_get_context() == 'blog'))  {
43
+        if ((elgg_get_context() == 'blog')) {
44 44
         $tabs = array(
45 45
             'all' => array(
46 46
                 'text' => elgg_echo('all'),
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
                 'href' => (isset($vars['friend_link'])) ? $vars['friend_link'] : "$context/friends/$username",
60 60
                 'selected' => ($filter_context == 'friends'),
61 61
                 'priority' => 400,
62
-            ),/*Hide for now
62
+            ), /*Hide for now
63 63
             'authors' => array(
64 64
                 'text' => elgg_echo('My favorite Authors'),
65 65
                 'href' => "activity/blog",
@@ -68,9 +68,9 @@  discard block
 block discarded – undo
68 68
             ),*/
69 69
         );
70 70
         
71
-        } else if((elgg_get_context() == 'thewire')){
71
+        } else if ((elgg_get_context() == 'thewire')) {
72 72
             //changing the tabs in the wire to add 'mentioned'
73
-            if($user = elgg_get_logged_in_user_entity()){
73
+            if ($user = elgg_get_logged_in_user_entity()) {
74 74
                       $tabs = array(
75 75
 		'all' => array(
76 76
 			'text' => elgg_echo('all'),
@@ -102,11 +102,11 @@  discard block
 block discarded – undo
102 102
 
103 103
             
104 104
             
105
-        }else if((elgg_get_context() == 'friend')){
105
+        } else if ((elgg_get_context() == 'friend')) {
106 106
             $tabs = elgg_view_menu('page', array('sort_by' => 'name'));
107 107
             //echo elgg_view_menu('page', array('sort_by' => 'name'));
108 108
             //echo '<div>Maybe Im stoopid?</div>';
109
-        }else{
109
+        } else {
110 110
     
111 111
 	$tabs = array(
112 112
 		'all' => array(
Please login to merge, or discard this patch.
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -102,11 +102,11 @@
 block discarded – undo
102 102
 
103 103
             
104 104
             
105
-        }else if((elgg_get_context() == 'friend')){
105
+        } else if((elgg_get_context() == 'friend')){
106 106
             $tabs = elgg_view_menu('page', array('sort_by' => 'name'));
107 107
             //echo elgg_view_menu('page', array('sort_by' => 'name'));
108 108
             //echo '<div>Maybe Im stoopid?</div>';
109
-        }else{
109
+        } else{
110 110
     
111 111
 	$tabs = array(
112 112
 		'all' => array(
Please login to merge, or discard this patch.
mod/wet4/views/default/page/layouts/dashboard.php 2 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -32,8 +32,8 @@  discard block
 block discarded – undo
32 32
 		echo elgg_extract('nav', $vars, elgg_view('navigation/breadcrumbs'));
33 33
 
34 34
 		echo elgg_view('page/layouts/elements/header', $vars);
35
-        echo '<section class="col-sm-12" id="wb-cont">';
36
-        echo '<h2 class="wb-invisible">'.elgg_echo('widgets').'</h2>';
35
+		echo '<section class="col-sm-12" id="wb-cont">';
36
+		echo '<h2 class="wb-invisible">'.elgg_echo('widgets').'</h2>';
37 37
 		echo $vars['content'];
38 38
 
39 39
 		// @deprecated 1.8
@@ -41,12 +41,12 @@  discard block
 block discarded – undo
41 41
 			echo $vars['area1'];
42 42
 		}
43 43
 
44
-        if (isset($vars['area2'])) {
44
+		if (isset($vars['area2'])) {
45 45
 			echo $vars['area2'];
46 46
 		}
47 47
 
48 48
 
49
-        echo '</section>';
49
+		echo '</section>';
50 50
 		echo elgg_view('page/layouts/elements/footer', $vars);
51 51
 	?>
52 52
 
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@
 block discarded – undo
33 33
 
34 34
 		echo elgg_view('page/layouts/elements/header', $vars);
35 35
         echo '<section class="col-sm-12" id="wb-cont">';
36
-        echo '<h2 class="wb-invisible">'.elgg_echo('widgets').'</h2>';
36
+        echo '<h2 class="wb-invisible">' . elgg_echo('widgets') . '</h2>';
37 37
 		echo $vars['content'];
38 38
 
39 39
 		// @deprecated 1.8
Please login to merge, or discard this patch.
mod/wet4/views/default/page/layouts/widgets/add_button.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@
 block discarded – undo
18 18
 	'text' => elgg_echo('widgets:add'),
19 19
 	'class' => 'elgg-button elgg-button-action elgg-lightbox btn btn-default mrgn-bttm-md mrgn-tp-sm',
20 20
 	'data-colorbox-opts' => '{"inline":true, "href":"#widget_manager_widgets_select", "innerWidth": 600, "maxHeight": "80%"}',
21
-    'tabindex' => '0',
21
+	'tabindex' => '0',
22 22
 );
23 23
 
24 24
 if (elgg_in_context("iframe_dashboard")) {
Please login to merge, or discard this patch.
mod/wet4/views/default/page/layouts/widgets/add_panel.php 2 patches
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -68,15 +68,15 @@  discard block
 block discarded – undo
68 68
 		
69 69
 		
70 70
 
71
-        //Add Yolo Code
71
+		//Add Yolo Code
72 72
 
73
-        if ($can_add && !$hide) {
73
+		if ($can_add && !$hide) {
74 74
 			$body .= "<div class='widget_manager_widgets_lightbox_wrapper clearfix'>";
75 75
 
76 76
 			if (!$allow_multiple && in_array($handler, $current_handlers)) {
77 77
 				$class = 'elgg-state-unavailable';
78
-                //changing what the button says to manage the widgets
79
-                $button_value = elgg_echo('widget:remove');
78
+				//changing what the button says to manage the widgets
79
+				$button_value = elgg_echo('widget:remove');
80 80
 			} else {
81 81
 				$class = 'elgg-state-available';
82 82
 			}
@@ -87,17 +87,17 @@  discard block
 block discarded – undo
87 87
 				$class .= ' elgg-widget-single';
88 88
 			}
89 89
 
90
-            $body .= "<span class='widget_manager_widgets_lightbox_actions'>";
91
-            $body .= '<ul class="list-unstyled"><li class="' . $class . '" data-elgg-widget-type="' . $handler . '">';
90
+			$body .= "<span class='widget_manager_widgets_lightbox_actions'>";
91
+			$body .= '<ul class="list-unstyled"><li class="' . $class . '" data-elgg-widget-type="' . $handler . '">';
92 92
 
93
-            $body .= elgg_view("input/button", array("class" => "elgg-button-submit widget-added", "value" => elgg_echo('widget:remove'),'title' => elgg_echo('widget:remove').' '. $widget->name ));
93
+			$body .= elgg_view("input/button", array("class" => "elgg-button-submit widget-added", "value" => elgg_echo('widget:remove'),'title' => elgg_echo('widget:remove').' '. $widget->name ));
94 94
 			$body .= elgg_view("input/button", array("class" => "elgg-button-submit widget-to-add", "value" => elgg_echo("widget_manager:button:add"),'title' => elgg_echo("widget_manager:button:add").' '. $widget->name ));
95 95
 			$body .= "</li></ul>";
96
-            $body .= "<span class='hidden wb-invisible'>Number of " . $widget->name . " widgets currently on the dashboard: </span>";
97
-            $body .= "</span>";
98
-            //trying to add the count, sometimes it works, sometimes it doesn't :(
99
-            $body .= "<span class='multi-widget-count'>";
100
-            $body .= "</span>";
96
+			$body .= "<span class='hidden wb-invisible'>Number of " . $widget->name . " widgets currently on the dashboard: </span>";
97
+			$body .= "</span>";
98
+			//trying to add the count, sometimes it works, sometimes it doesn't :(
99
+			$body .= "<span class='multi-widget-count'>";
100
+			$body .= "</span>";
101 101
 			$description = $widget->description;
102 102
 			if(empty($description)){
103 103
 				$description = "&nbsp;"; 	// need to fill up for correct layout
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 $title = "<div id='widget_manager_widgets_search'>";
54 54
 $title .= elgg_view('input/text', [
55 55
 	'title' => elgg_echo('search'),
56
-	'placeholder' => elgg_echo('widget_manager:filter_widgets'),					// GCconnex patch to clarify the purpose of the text box
56
+	'placeholder' => elgg_echo('widget_manager:filter_widgets'), // GCconnex patch to clarify the purpose of the text box
57 57
 	'onkeyup' => 'elgg.widget_manager.widgets_search($(this).val());'
58 58
 ]);
59 59
 $title .= "</div>";
@@ -90,8 +90,8 @@  discard block
 block discarded – undo
90 90
             $body .= "<span class='widget_manager_widgets_lightbox_actions'>";
91 91
             $body .= '<ul class="list-unstyled"><li class="' . $class . '" data-elgg-widget-type="' . $handler . '">';
92 92
 
93
-            $body .= elgg_view("input/button", array("class" => "elgg-button-submit widget-added", "value" => elgg_echo('widget:remove'),'title' => elgg_echo('widget:remove').' '. $widget->name ));
94
-			$body .= elgg_view("input/button", array("class" => "elgg-button-submit widget-to-add", "value" => elgg_echo("widget_manager:button:add"),'title' => elgg_echo("widget_manager:button:add").' '. $widget->name ));
93
+            $body .= elgg_view("input/button", array("class" => "elgg-button-submit widget-added", "value" => elgg_echo('widget:remove'), 'title' => elgg_echo('widget:remove') . ' ' . $widget->name));
94
+			$body .= elgg_view("input/button", array("class" => "elgg-button-submit widget-to-add", "value" => elgg_echo("widget_manager:button:add"), 'title' => elgg_echo("widget_manager:button:add") . ' ' . $widget->name));
95 95
 			$body .= "</li></ul>";
96 96
             $body .= "<span class='hidden wb-invisible'>Number of " . $widget->name . " widgets currently on the dashboard: </span>";
97 97
             $body .= "</span>";
@@ -99,13 +99,13 @@  discard block
 block discarded – undo
99 99
             $body .= "<span class='multi-widget-count'>";
100 100
             $body .= "</span>";
101 101
 			$description = $widget->description;
102
-			if(empty($description)){
103
-				$description = "&nbsp;"; 	// need to fill up for correct layout
102
+			if (empty($description)) {
103
+				$description = "&nbsp;"; // need to fill up for correct layout
104 104
 			}
105 105
 
106 106
 			$wname = str_ireplace(" ", "_", $widget->name);
107 107
 			$body .= "<div><b>" . $widget->name . "</b></div>";
108
-			$body .= "<div class='elgg-quiet'><abbr style='border-bottom: 1px dotted;' alt=\"" . elgg_echo("widget-accessibility:info:$widget_context:$wname") . "\" title=\"". elgg_echo("widget-accessibility:info:$widget_context:$wname") ."\" > " . $description . "</abbr></div>";
108
+			$body .= "<div class='elgg-quiet'><abbr style='border-bottom: 1px dotted;' alt=\"" . elgg_echo("widget-accessibility:info:$widget_context:$wname") . "\" title=\"" . elgg_echo("widget-accessibility:info:$widget_context:$wname") . "\" > " . $description . "</abbr></div>";
109 109
 
110 110
 			$body .= "</div>";
111 111
 		}
@@ -119,4 +119,4 @@  discard block
 block discarded – undo
119 119
 	$module_type = "inline";
120 120
 }
121 121
 
122
-echo "<div class='elgg-widgets-add-panel hidden wb-invisible'>" . elgg_view_module($module_type, '', $body, array("id" => "widget_manager_widgets_select", 'header' => $title, )) . "</div>";
122
+echo "<div class='elgg-widgets-add-panel hidden wb-invisible'>" . elgg_view_module($module_type, '', $body, array("id" => "widget_manager_widgets_select", 'header' => $title,)) . "</div>";
Please login to merge, or discard this patch.
mod/wet4/views/default/page/layouts/one_sidebar.php 2 patches
Indentation   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -24,45 +24,45 @@
 block discarded – undo
24 24
 
25 25
 <?php
26 26
 
27
-    $context = elgg_get_context();
27
+	$context = elgg_get_context();
28 28
 
29
-    /// forums will take up the whole width of the screen, while others will take up only a portion
30
-    echo ($context === 'gcforums') ? '<section class="col-md-12 mrgn-bttm-md" id="wb-cont">' : '<section class="col-md-8 mrgn-bttm-md" id="wb-cont">';
29
+	/// forums will take up the whole width of the screen, while others will take up only a portion
30
+	echo ($context === 'gcforums') ? '<section class="col-md-12 mrgn-bttm-md" id="wb-cont">' : '<section class="col-md-8 mrgn-bttm-md" id="wb-cont">';
31 31
 
32 32
 	echo elgg_view('page/layouts/elements/header', $vars);
33 33
     
34
-    // This basically moves the "page menu" element to the tabs on pages where the side bar links are now tabs :)
34
+	// This basically moves the "page menu" element to the tabs on pages where the side bar links are now tabs :)
35 35
 	if ($context == 'friends' || $context == 'messages' || $context == 'settings')
36
-        echo elgg_view_menu('page', array('sort_by' => 'priority'));
36
+		echo elgg_view_menu('page', array('sort_by' => 'priority'));
37 37
 
38
-    // @todo deprecated so remove in Elgg 2.0
38
+	// @todo deprecated so remove in Elgg 2.0
39 39
 	if (isset($vars['area1'])) echo $vars['area1'];
40 40
 			
41 41
 	if (isset($vars['content'])) {
42 42
         
43
-        if (elgg_is_logged_in() && $context !== 'group_profile') {
43
+		if (elgg_is_logged_in() && $context !== 'group_profile') {
44 44
 
45
-            $buttons = elgg_view_menu('title', array(
46
-               'sort_by' => 'priority',
47
-               'class' => 'list-inline pull-right',
48
-                'item_class' => 'btn btn-primary btn-md',
49
-            ));
45
+			$buttons = elgg_view_menu('title', array(
46
+			   'sort_by' => 'priority',
47
+			   'class' => 'list-inline pull-right',
48
+				'item_class' => 'btn btn-primary btn-md',
49
+			));
50 50
 
51
-            $buttons2 = elgg_view_menu('title2', array(
52
-               'sort_by' => 'priority',
53
-               'class' => 'list-inline pull-right',
54
-                'item_class' => 'btn btn-default btn-md mrgn-rght-md',
55
-            ));
51
+			$buttons2 = elgg_view_menu('title2', array(
52
+			   'sort_by' => 'priority',
53
+			   'class' => 'list-inline pull-right',
54
+				'item_class' => 'btn btn-default btn-md mrgn-rght-md',
55
+			));
56 56
 
57
-            echo "<div class='clearfix'>{$buttons} {$buttons2}</div>";
57
+			echo "<div class='clearfix'>{$buttons} {$buttons2}</div>";
58 58
             
59
-        }
60
-        echo $vars['content'];
59
+		}
60
+		echo $vars['content'];
61 61
 		
62 62
 	}
63 63
     
64 64
 
65
-    echo elgg_view('page/layouts/elements/footer', $vars);
65
+	echo elgg_view('page/layouts/elements/footer', $vars);
66 66
 ?>
67 67
     </section>
68 68
 
Please login to merge, or discard this patch.
Braces   +6 added lines, -3 removed lines patch added patch discarded remove patch
@@ -32,11 +32,14 @@
 block discarded – undo
32 32
 	echo elgg_view('page/layouts/elements/header', $vars);
33 33
     
34 34
     // This basically moves the "page menu" element to the tabs on pages where the side bar links are now tabs :)
35
-	if ($context == 'friends' || $context == 'messages' || $context == 'settings')
36
-        echo elgg_view_menu('page', array('sort_by' => 'priority'));
35
+	if ($context == 'friends' || $context == 'messages' || $context == 'settings') {
36
+	        echo elgg_view_menu('page', array('sort_by' => 'priority'));
37
+	}
37 38
 
38 39
     // @todo deprecated so remove in Elgg 2.0
39
-	if (isset($vars['area1'])) echo $vars['area1'];
40
+	if (isset($vars['area1'])) {
41
+		echo $vars['area1'];
42
+	}
40 43
 			
41 44
 	if (isset($vars['content'])) {
42 45
         
Please login to merge, or discard this patch.