@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | "name" => "collection_name", |
27 | 27 | "id" => "collection_name", |
28 | 28 | "value" => $title, |
29 | - 'required '=> "required", |
|
29 | + 'required '=> "required", |
|
30 | 30 | )); |
31 | 31 | echo "</div>"; |
32 | 32 | |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | 'id' => 'friends_collection', |
53 | 53 | 'value' => $members, |
54 | 54 | 'highlight' => $highlight, |
55 | - 'collection_id' => $vars['collection']->id, |
|
55 | + 'collection_id' => $vars['collection']->id, |
|
56 | 56 | 'formtarget' => $site_url . 'action/friends/collections/edit', |
57 | 57 | )); |
58 | 58 | echo "</div>"; |
@@ -16,7 +16,7 @@ |
||
16 | 16 | if (isset($vars['collection'])) { |
17 | 17 | $title = $vars['collection']->name; |
18 | 18 | $highlight = 'default'; |
19 | -} else { |
|
19 | +} else { |
|
20 | 20 | $title = ""; |
21 | 21 | $highlight = 'all'; |
22 | 22 | } |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | "name" => "collection_name", |
27 | 27 | "id" => "collection_name", |
28 | 28 | "value" => $title, |
29 | - 'required '=> "required", |
|
29 | + 'required '=> "required", |
|
30 | 30 | )); |
31 | 31 | echo "</div>"; |
32 | 32 | |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | 'name' => 'friends_collection', |
52 | 52 | 'id' => 'friends_collection', |
53 | 53 | 'highlight' => $highlight, |
54 | - 'value' => $members |
|
54 | + 'value' => $members |
|
55 | 55 | )); |
56 | 56 | echo "</div>"; |
57 | 57 |
@@ -16,7 +16,7 @@ |
||
16 | 16 | if (isset($vars['collection'])) { |
17 | 17 | $title = $vars['collection']->name; |
18 | 18 | $highlight = 'default'; |
19 | -} else { |
|
19 | +} else { |
|
20 | 20 | $title = ""; |
21 | 21 | $highlight = 'all'; |
22 | 22 | } |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | $save_button = elgg_view('input/submit', array( |
69 | 69 | 'value' => elgg_echo('publish'), |
70 | 70 | 'name' => 'save', |
71 | - 'class' => 'btn btn-primary', |
|
71 | + 'class' => 'btn btn-primary', |
|
72 | 72 | )); |
73 | 73 | $action_buttons = $save_button . $preview_button . $delete_link; |
74 | 74 | |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | 'id' => 'blog_title_en', |
84 | 84 | 'required' => 'required', |
85 | 85 | 'value' => $vars['title'], |
86 | - 'autofocus' =>'true', |
|
86 | + 'autofocus' =>'true', |
|
87 | 87 | )); |
88 | 88 | |
89 | 89 | $label2 = elgg_echo('title:fr'); |
@@ -119,8 +119,8 @@ discard block |
||
119 | 119 | $body_input = elgg_view('input/longtext', array( |
120 | 120 | 'name' => 'description', |
121 | 121 | 'id' => 'blog_description_en', |
122 | - 'class' => 'validate-me', |
|
123 | - 'required '=> "required", |
|
122 | + 'class' => 'validate-me', |
|
123 | + 'required '=> "required", |
|
124 | 124 | 'value' => $vars['description'] |
125 | 125 | )); |
126 | 126 | |
@@ -128,8 +128,8 @@ discard block |
||
128 | 128 | $body_input2 = elgg_view('input/longtext', array( |
129 | 129 | 'name' => 'description2', |
130 | 130 | 'id' => 'blog_description_fr', |
131 | - 'class' => 'validate-me', |
|
132 | - 'required '=> "required", |
|
131 | + 'class' => 'validate-me', |
|
132 | + 'required '=> "required", |
|
133 | 133 | 'value' => $vars['description2'] |
134 | 134 | )); |
135 | 135 | |
@@ -195,10 +195,10 @@ discard block |
||
195 | 195 | // this view is used by both creating new blog and edit new blog |
196 | 196 | |
197 | 197 | $minor_edit = "<h2>".elgg_echo('cp_notify:minor_edit_header')."</h2>"; |
198 | - $minor_edit .= '<div class="checkbox">'; |
|
199 | - $minor_edit .= elgg_view('input/checkboxes', array( |
|
198 | + $minor_edit .= '<div class="checkbox">'; |
|
199 | + $minor_edit .= elgg_view('input/checkboxes', array( |
|
200 | 200 | 'name' => 'chk_blog_minor_edit', |
201 | - 'label'=> elgg_echo('blog:minor_edit_label'), |
|
201 | + 'label'=> elgg_echo('blog:minor_edit_label'), |
|
202 | 202 | 'id' => 'chk_blog_minor_edit', |
203 | 203 | 'value' => $blog->entity_minor_edit, |
204 | 204 | 'options' => array( elgg_echo('cp_notify:minor_edit') => 1 ), |
@@ -29,17 +29,17 @@ discard block |
||
29 | 29 | $json_desc = json_decode($vars['description']); |
30 | 30 | $json_exc = json_decode($vars['excerpt']); |
31 | 31 | |
32 | -if ( $json_title ){ |
|
32 | +if ($json_title) { |
|
33 | 33 | $vars['title2'] = $json_title->fr; |
34 | 34 | $vars['title'] = $json_title->en; |
35 | 35 | } |
36 | 36 | |
37 | -if ( $json_desc ){ |
|
37 | +if ($json_desc) { |
|
38 | 38 | $vars['description2'] = $json_desc->fr; |
39 | 39 | $vars['description'] = $json_desc->en; |
40 | 40 | } |
41 | 41 | |
42 | -if ( $json_exc ){ |
|
42 | +if ($json_exc) { |
|
43 | 43 | $excerpt2 = $json_desc->fr; |
44 | 44 | $excerpt = $json_desc->en; |
45 | 45 | } |
@@ -72,9 +72,9 @@ discard block |
||
72 | 72 | )); |
73 | 73 | $action_buttons = $save_button . $preview_button . $delete_link; |
74 | 74 | |
75 | -$btn_language = '<ul class="nav nav-tabs nav-tabs-language"> |
|
76 | - <li id="btnen"><a href="#" id="btnClicken">'.elgg_echo('lang:english').'</a></li> |
|
77 | - <li id="btnfr"><a href="#" id="btnClickfr">'.elgg_echo('lang:french').'</a></li> |
|
75 | +$btn_language = '<ul class="nav nav-tabs nav-tabs-language"> |
|
76 | + <li id="btnen"><a href="#" id="btnClicken">'.elgg_echo('lang:english') . '</a></li> |
|
77 | + <li id="btnfr"><a href="#" id="btnClickfr">'.elgg_echo('lang:french') . '</a></li> |
|
78 | 78 | </ul>'; |
79 | 79 | |
80 | 80 | $label = elgg_echo('title:en'); |
@@ -190,18 +190,18 @@ discard block |
||
190 | 190 | |
191 | 191 | <?php |
192 | 192 | // code snippet below will be for minor edit for blog revisions... |
193 | -if ($vars['guid'] && (strcmp($vars['status'],'draft') != 0 && elgg_is_active_plugin('cp_notifications') && !$vars['new_entity'])) { |
|
193 | +if ($vars['guid'] && (strcmp($vars['status'], 'draft') != 0 && elgg_is_active_plugin('cp_notifications') && !$vars['new_entity'])) { |
|
194 | 194 | // cyu - implement "minor edit" as per business requirements document |
195 | 195 | // this view is used by both creating new blog and edit new blog |
196 | 196 | |
197 | - $minor_edit = "<h2>".elgg_echo('cp_notify:minor_edit_header')."</h2>"; |
|
197 | + $minor_edit = "<h2>" . elgg_echo('cp_notify:minor_edit_header') . "</h2>"; |
|
198 | 198 | $minor_edit .= '<div class="checkbox">'; |
199 | 199 | $minor_edit .= elgg_view('input/checkboxes', array( |
200 | 200 | 'name' => 'chk_blog_minor_edit', |
201 | 201 | 'label'=> elgg_echo('blog:minor_edit_label'), |
202 | 202 | 'id' => 'chk_blog_minor_edit', |
203 | 203 | 'value' => $blog->entity_minor_edit, |
204 | - 'options' => array( elgg_echo('cp_notify:minor_edit') => 1 ), |
|
204 | + 'options' => array(elgg_echo('cp_notify:minor_edit') => 1), |
|
205 | 205 | )); |
206 | 206 | |
207 | 207 | // cyu - see note: |
@@ -300,7 +300,7 @@ discard block |
||
300 | 300 | |
301 | 301 | ___HTML; |
302 | 302 | |
303 | -if(get_current_language() == 'fr'){ |
|
303 | +if (get_current_language() == 'fr') { |
|
304 | 304 | ?> |
305 | 305 | <script> |
306 | 306 | jQuery('.fr').show(); |
@@ -311,7 +311,7 @@ discard block |
||
311 | 311 | |
312 | 312 | </script> |
313 | 313 | <?php |
314 | -}else{ |
|
314 | +} else { |
|
315 | 315 | ?> |
316 | 316 | <script> |
317 | 317 | jQuery('.en').show(); |
@@ -209,8 +209,9 @@ discard block |
||
209 | 209 | // we need to make sure that we invoke sending notifcations only once, mark the second function as |
210 | 210 | // minor edit by default |
211 | 211 | |
212 | - if ($vars['new_entity']) |
|
213 | - $entity->entity_minor_edit = true; |
|
212 | + if ($vars['new_entity']) { |
|
213 | + $entity->entity_minor_edit = true; |
|
214 | + } |
|
214 | 215 | |
215 | 216 | $minor_edit .= '</div>'; |
216 | 217 | } |
@@ -311,7 +312,7 @@ discard block |
||
311 | 312 | |
312 | 313 | </script> |
313 | 314 | <?php |
314 | -}else{ |
|
315 | +} else{ |
|
315 | 316 | ?> |
316 | 317 | <script> |
317 | 318 | jQuery('.en').show(); |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | <?php echo elgg_view('input/access', array( |
86 | 86 | 'name' => 'access_id', |
87 | 87 | 'value' => $access_id, |
88 | - 'id' => 'access_id', |
|
88 | + 'id' => 'access_id', |
|
89 | 89 | 'entity' => get_entity($guid), |
90 | 90 | 'entity_type' => 'object', |
91 | 91 | 'entity_subtype' => 'bookmarks', |
@@ -101,9 +101,9 @@ discard block |
||
101 | 101 | } |
102 | 102 | |
103 | 103 | if($guid){ |
104 | - echo elgg_view('input/submit', array('value' => elgg_echo('save'), 'class'=>'btn btn-primary')); |
|
104 | + echo elgg_view('input/submit', array('value' => elgg_echo('save'), 'class'=>'btn btn-primary')); |
|
105 | 105 | } else { |
106 | - echo elgg_view('input/submit', array('value' => elgg_echo('bookmarks:add'), 'class'=>'btn btn-primary')); |
|
106 | + echo elgg_view('input/submit', array('value' => elgg_echo('bookmarks:add'), 'class'=>'btn btn-primary')); |
|
107 | 107 | } |
108 | 108 | |
109 | 109 | echo'</div></div>'; |
@@ -24,20 +24,20 @@ discard block |
||
24 | 24 | $json_title = json_decode($title); |
25 | 25 | $json_desc = json_decode($desc); |
26 | 26 | |
27 | -if ( $json_title ){ |
|
27 | +if ($json_title) { |
|
28 | 28 | $title2 = $json_title->fr; |
29 | 29 | $title = $json_title->en; |
30 | 30 | } |
31 | 31 | |
32 | -if ( $json_desc ){ |
|
32 | +if ($json_desc) { |
|
33 | 33 | $desc2 = $json_desc->fr; |
34 | 34 | $desc = $json_desc->en; |
35 | 35 | } |
36 | 36 | |
37 | 37 | |
38 | -$btn_language = '<ul class="nav nav-tabs nav-tabs-language"> |
|
39 | - <li id="btnen"><a href="#" id="btnClicken">'.elgg_echo('lang:english').'</a></li> |
|
40 | - <li id="btnfr"><a href="#" id="btnClickfr">'.elgg_echo('lang:french').'</a></li> |
|
38 | +$btn_language = '<ul class="nav nav-tabs nav-tabs-language"> |
|
39 | + <li id="btnen"><a href="#" id="btnClicken">'.elgg_echo('lang:english') . '</a></li> |
|
40 | + <li id="btnfr"><a href="#" id="btnClickfr">'.elgg_echo('lang:french') . '</a></li> |
|
41 | 41 | </ul>'; |
42 | 42 | |
43 | 43 | echo $btn_language; |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | echo elgg_view('input/hidden', array('name' => 'guid', 'value' => $guid)); |
101 | 101 | } |
102 | 102 | |
103 | -if($guid){ |
|
103 | +if ($guid) { |
|
104 | 104 | echo elgg_view('input/submit', array('value' => elgg_echo('save'), 'class'=>'btn btn-primary')); |
105 | 105 | } else { |
106 | 106 | echo elgg_view('input/submit', array('value' => elgg_echo('bookmarks:add'), 'class'=>'btn btn-primary')); |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | |
109 | 109 | echo'</div></div>'; |
110 | 110 | |
111 | -if(get_current_language() == 'fr'){ |
|
111 | +if (get_current_language() == 'fr') { |
|
112 | 112 | ?> |
113 | 113 | <script> |
114 | 114 | jQuery('.fr').show(); |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | |
118 | 118 | </script> |
119 | 119 | <?php |
120 | -}else{ |
|
120 | +} else { |
|
121 | 121 | ?> |
122 | 122 | <script> |
123 | 123 | jQuery('.en').show(); |
@@ -117,7 +117,7 @@ |
||
117 | 117 | |
118 | 118 | </script> |
119 | 119 | <?php |
120 | -}else{ |
|
120 | +} else{ |
|
121 | 121 | ?> |
122 | 122 | <script> |
123 | 123 | jQuery('.en').show(); |
@@ -65,9 +65,9 @@ |
||
65 | 65 | $description_input = elgg_view('input/longtext', array( |
66 | 66 | 'name' => 'description', |
67 | 67 | 'value' => $value, |
68 | - 'class' => 'validate-me', |
|
68 | + 'class' => 'validate-me', |
|
69 | 69 | 'required '=> "required", |
70 | - 'id' => 'box-'. $reply->guid, |
|
70 | + 'id' => 'box-'. $reply->guid, |
|
71 | 71 | )); |
72 | 72 | |
73 | 73 | echo <<<FORM |
@@ -67,7 +67,7 @@ |
||
67 | 67 | 'value' => $value, |
68 | 68 | 'class' => 'validate-me', |
69 | 69 | 'required '=> "required", |
70 | - 'id' => 'box-'. $reply->guid, |
|
70 | + 'id' => 'box-' . $reply->guid, |
|
71 | 71 | )); |
72 | 72 | |
73 | 73 | echo <<<FORM |
@@ -74,14 +74,14 @@ discard block |
||
74 | 74 | <?php |
75 | 75 | echo elgg_view('input/select', array( |
76 | 76 | 'name' => 'status', |
77 | - 'id' => 'status', |
|
77 | + 'id' => 'status', |
|
78 | 78 | 'value' => $status, |
79 | 79 | 'options_values' => array( |
80 | 80 | 'open' => elgg_echo('status:open'), |
81 | 81 | 'closed' => elgg_echo('status:closed'), |
82 | 82 | ), |
83 | 83 | )); |
84 | - ?> |
|
84 | + ?> |
|
85 | 85 | </div> |
86 | 86 | |
87 | 87 | <div class="mrgn-bttm-md"> |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | <?php echo elgg_view('input/access', array( |
90 | 90 | 'name' => 'access_id', |
91 | 91 | 'value' => $access_id, |
92 | - 'id' => 'access_id', |
|
92 | + 'id' => 'access_id', |
|
93 | 93 | 'entity' => get_entity($guid), |
94 | 94 | 'entity_type' => 'object', |
95 | 95 | 'entity_subtype' => 'groupforumtopic', |
@@ -104,9 +104,9 @@ discard block |
||
104 | 104 | echo elgg_view('input/hidden', array('name' => 'topic_guid', 'value' => $guid)); |
105 | 105 | } |
106 | 106 | if($guid){ |
107 | - echo elgg_view('input/submit', array('value' => elgg_echo('save'), 'class' => 'btn btn-primary')); |
|
107 | + echo elgg_view('input/submit', array('value' => elgg_echo('save'), 'class' => 'btn btn-primary')); |
|
108 | 108 | } else { |
109 | - echo elgg_view('input/submit', array('value' => 'Create Discussion', 'class' => 'btn btn-primary')); |
|
109 | + echo elgg_view('input/submit', array('value' => 'Create Discussion', 'class' => 'btn btn-primary')); |
|
110 | 110 | } |
111 | 111 | |
112 | 112 |
@@ -21,22 +21,22 @@ discard block |
||
21 | 21 | $json_title = json_decode($title); |
22 | 22 | $json_desc = json_decode(elgg_extract('description', $vars, '')); |
23 | 23 | |
24 | -if ( $json_title ){ |
|
24 | +if ($json_title) { |
|
25 | 25 | $title2 = $json_title->fr; |
26 | 26 | $title = $json_title->en; |
27 | 27 | |
28 | 28 | } |
29 | 29 | |
30 | -if ( $json_desc ){ |
|
30 | +if ($json_desc) { |
|
31 | 31 | $desc2 = $json_desc->fr; |
32 | 32 | $desc = $json_desc->en; |
33 | 33 | } |
34 | 34 | |
35 | 35 | |
36 | 36 | |
37 | -$btn_language = '<ul class="nav nav-tabs nav-tabs-language"> |
|
38 | - <li id="btnen"><a href="#" id="btnClicken">'.elgg_echo('lang:english').'</a></li> |
|
39 | - <li id="btnfr"><a href="#" id="btnClickfr">'.elgg_echo('lang:french').'</a></li> |
|
37 | +$btn_language = '<ul class="nav nav-tabs nav-tabs-language"> |
|
38 | + <li id="btnen"><a href="#" id="btnClicken">'.elgg_echo('lang:english') . '</a></li> |
|
39 | + <li id="btnfr"><a href="#" id="btnClickfr">'.elgg_echo('lang:french') . '</a></li> |
|
40 | 40 | </ul>'; |
41 | 41 | |
42 | 42 | echo $btn_language; |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | if ($guid) { |
104 | 104 | echo elgg_view('input/hidden', array('name' => 'topic_guid', 'value' => $guid)); |
105 | 105 | } |
106 | -if($guid){ |
|
106 | +if ($guid) { |
|
107 | 107 | echo elgg_view('input/submit', array('value' => elgg_echo('save'), 'class' => 'btn btn-primary')); |
108 | 108 | } else { |
109 | 109 | echo elgg_view('input/submit', array('value' => 'Create Discussion', 'class' => 'btn btn-primary')); |
@@ -112,7 +112,7 @@ discard block |
||
112 | 112 | |
113 | 113 | echo'</div></div></div>'; |
114 | 114 | |
115 | -if(get_current_language() == 'fr'){ |
|
115 | +if (get_current_language() == 'fr') { |
|
116 | 116 | ?> |
117 | 117 | <script> |
118 | 118 | jQuery('.fr').show(); |
@@ -122,7 +122,7 @@ discard block |
||
122 | 122 | $('#description').removeClass('validate-me'); |
123 | 123 | </script> |
124 | 124 | <?php |
125 | -}else{ |
|
125 | +} else { |
|
126 | 126 | ?> |
127 | 127 | <script> |
128 | 128 | jQuery('.en').show(); |
@@ -122,7 +122,7 @@ |
||
122 | 122 | $('#description').removeClass('validate-me'); |
123 | 123 | </script> |
124 | 124 | <?php |
125 | -}else{ |
|
125 | +} else{ |
|
126 | 126 | ?> |
127 | 127 | <script> |
128 | 128 | jQuery('.en').show(); |
@@ -108,8 +108,8 @@ discard block |
||
108 | 108 | $comment_input = elgg_view('input/longtext', array( |
109 | 109 | 'name' => 'generic_comment', |
110 | 110 | 'id' => 'generic_comment_'.$entity->getGUID(), |
111 | - 'class' => 'validate-me', |
|
112 | - 'required' => 'required', |
|
111 | + 'class' => 'validate-me', |
|
112 | + 'required' => 'required', |
|
113 | 113 | 'value' => $comment_text, |
114 | 114 | )); |
115 | 115 | |
@@ -118,8 +118,8 @@ discard block |
||
118 | 118 | |
119 | 119 | $comment_input = elgg_view('input/longtext', array( |
120 | 120 | 'name' => 'generic_comment', |
121 | - 'class' => 'validate-me', |
|
122 | - 'required '=> "required", |
|
121 | + 'class' => 'validate-me', |
|
122 | + 'required '=> "required", |
|
123 | 123 | 'value' => $comment_text, |
124 | 124 | 'id' => 'generic_comment', |
125 | 125 | )); |
@@ -153,7 +153,7 @@ discard block |
||
153 | 153 | <div class="modal-header"> |
154 | 154 | <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button> |
155 | 155 | <?php |
156 | - echo '<h4 class="modal-title" id="myModalLabel">'.elgg_echo("comment_notif_title",array($container->getDisplayName())).'</h4> |
|
156 | + echo '<h4 class="modal-title" id="myModalLabel">'.elgg_echo("comment_notif_title",array($container->getDisplayName())).'</h4> |
|
157 | 157 | </div> |
158 | 158 | <div class="modal-body"> |
159 | 159 | '.elgg_echo("comment_notif_description").' |
@@ -162,39 +162,39 @@ discard block |
||
162 | 162 | |
163 | 163 | |
164 | 164 | |
165 | - $url = elgg_get_site_url() . "action/groups/join?group_guid={$container->getGUID()}"; |
|
166 | - $url = elgg_add_action_tokens_to_url($url); |
|
167 | - elgg_register_menu_item('modal_notif', array( |
|
168 | - 'name' => 'join', |
|
169 | - 'id' => 'join', |
|
170 | - 'href' => $url, |
|
171 | - 'text' => elgg_echo('join'), |
|
172 | - 'link_class' => 'elgg-button elgg-button-action', |
|
173 | - )); |
|
165 | + $url = elgg_get_site_url() . "action/groups/join?group_guid={$container->getGUID()}"; |
|
166 | + $url = elgg_add_action_tokens_to_url($url); |
|
167 | + elgg_register_menu_item('modal_notif', array( |
|
168 | + 'name' => 'join', |
|
169 | + 'id' => 'join', |
|
170 | + 'href' => $url, |
|
171 | + 'text' => elgg_echo('join'), |
|
172 | + 'link_class' => 'elgg-button elgg-button-action', |
|
173 | + )); |
|
174 | 174 | |
175 | 175 | $buttons = elgg_view_menu('modal_notif', array( |
176 | - 'sort_by' => 'priority', |
|
177 | - 'class' => 'hidden', |
|
178 | - 'id' => 'join', |
|
179 | - 'item_class' => 'btn btn-primary', |
|
180 | - )); |
|
176 | + 'sort_by' => 'priority', |
|
177 | + 'class' => 'hidden', |
|
178 | + 'id' => 'join', |
|
179 | + 'item_class' => 'btn btn-primary', |
|
180 | + )); |
|
181 | 181 | |
182 | - echo $buttons; |
|
182 | + echo $buttons; |
|
183 | 183 | |
184 | 184 | if ( $container instanceof ElggGroup ){ |
185 | - if ($container->isPublicMembership() || $container->canEdit()) { |
|
186 | - echo '<button class="mrgn-tp-sm btn btn-primary" onclick = "join_comment('.$group->guid.',\''.$user->guid.'\',\'open\')">'.elgg_echo("groups:join").'</button>'; |
|
185 | + if ($container->isPublicMembership() || $container->canEdit()) { |
|
186 | + echo '<button class="mrgn-tp-sm btn btn-primary" onclick = "join_comment('.$group->guid.',\''.$user->guid.'\',\'open\')">'.elgg_echo("groups:join").'</button>'; |
|
187 | 187 | |
188 | 188 | } else { |
189 | 189 | // request membership |
190 | - echo '<button class="mrgn-tp-sm btn btn-primary" onclick = "join_comment('.$group->guid.',\''.$user->guid.'\',\'close\')">'.elgg_echo("groups:joinrequest").'</button>'; |
|
190 | + echo '<button class="mrgn-tp-sm btn btn-primary" onclick = "join_comment('.$group->guid.',\''.$user->guid.'\',\'close\')">'.elgg_echo("groups:joinrequest").'</button>'; |
|
191 | 191 | |
192 | 192 | } |
193 | 193 | } |
194 | 194 | |
195 | 195 | echo elgg_view('input/submit', array('value' => elgg_echo('comment'), 'id' => 'comment_test','class' => 'mrgn-tp-sm btn', )); |
196 | 196 | |
197 | - ?> |
|
197 | + ?> |
|
198 | 198 | |
199 | 199 | |
200 | 200 | </div> |
@@ -47,9 +47,9 @@ discard block |
||
47 | 47 | $entity = elgg_extract('entity', $vars); |
48 | 48 | $comment = elgg_extract('comment', $vars); |
49 | 49 | |
50 | -if(empty($entity)){ |
|
50 | +if (empty($entity)) { |
|
51 | 51 | $container = $comment->getContainerEntity(); |
52 | -}else{ |
|
52 | +} else { |
|
53 | 53 | $container = $entity->getContainerEntity(); |
54 | 54 | } |
55 | 55 | |
@@ -78,18 +78,18 @@ discard block |
||
78 | 78 | 'name' => 'comment_guid', |
79 | 79 | 'value' => $comment->guid, |
80 | 80 | )); |
81 | - $comment_label = elgg_echo("generic_comments:edit"); |
|
81 | + $comment_label = elgg_echo("generic_comments:edit"); |
|
82 | 82 | $submit_input = elgg_view('input/submit', array('value' => elgg_echo('save'))); |
83 | 83 | $comment_text = $comment->description; |
84 | 84 | } else { |
85 | - $comment_label = elgg_echo("generic_comments:add"); |
|
85 | + $comment_label = elgg_echo("generic_comments:add"); |
|
86 | 86 | |
87 | - if ((elgg_instanceof($container, 'group')) && (!$container->isMember($userentity))){ |
|
87 | + if ((elgg_instanceof($container, 'group')) && (!$container->isMember($userentity))) { |
|
88 | 88 | |
89 | 89 | $submit_input = elgg_view('input/button', array('value' => elgg_echo('comment'), 'class' => 'mrgn-tp-sm btn btn-primary', 'data-target' => "#notif_comment", 'data-toggle' => "modal")); |
90 | 90 | |
91 | - }else{ |
|
92 | - $submit_input = elgg_view('input/submit', array('value' => elgg_echo('comment'), 'class' => 'mrgn-tp-sm btn btn-primary', )); |
|
91 | + } else { |
|
92 | + $submit_input = elgg_view('input/submit', array('value' => elgg_echo('comment'), 'class' => 'mrgn-tp-sm btn btn-primary',)); |
|
93 | 93 | |
94 | 94 | } |
95 | 95 | } |
@@ -104,10 +104,10 @@ discard block |
||
104 | 104 | } |
105 | 105 | |
106 | 106 | if ($inline) { |
107 | - $label = '<label for="generic_comment_'.$entity->getGUID().'">'.elgg_echo('comment').'</label>'; |
|
107 | + $label = '<label for="generic_comment_' . $entity->getGUID() . '">' . elgg_echo('comment') . '</label>'; |
|
108 | 108 | $comment_input = elgg_view('input/longtext', array( |
109 | 109 | 'name' => 'generic_comment', |
110 | - 'id' => 'generic_comment_'.$entity->getGUID(), |
|
110 | + 'id' => 'generic_comment_' . $entity->getGUID(), |
|
111 | 111 | 'class' => 'validate-me', |
112 | 112 | 'required' => 'required', |
113 | 113 | 'value' => $comment_text, |
@@ -126,7 +126,7 @@ discard block |
||
126 | 126 | |
127 | 127 | $is_edit_page_input = elgg_view('input/hidden', array( |
128 | 128 | 'name' => 'is_edit_page', |
129 | - 'value' => (int)$is_edit_page, |
|
129 | + 'value' => (int) $is_edit_page, |
|
130 | 130 | )); |
131 | 131 | |
132 | 132 | echo <<<FORM |
@@ -153,10 +153,10 @@ discard block |
||
153 | 153 | <div class="modal-header"> |
154 | 154 | <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button> |
155 | 155 | <?php |
156 | - echo '<h4 class="modal-title" id="myModalLabel">'.elgg_echo("comment_notif_title",array($container->getDisplayName())).'</h4> |
|
156 | + echo '<h4 class="modal-title" id="myModalLabel">' . elgg_echo("comment_notif_title", array($container->getDisplayName())) . '</h4> |
|
157 | 157 | </div> |
158 | 158 | <div class="modal-body"> |
159 | - '.elgg_echo("comment_notif_description").' |
|
159 | + '.elgg_echo("comment_notif_description") . ' |
|
160 | 160 | </div> |
161 | 161 | <div class="modal-footer">'; |
162 | 162 | |
@@ -181,18 +181,18 @@ discard block |
||
181 | 181 | |
182 | 182 | echo $buttons; |
183 | 183 | |
184 | - if ( $container instanceof ElggGroup ){ |
|
184 | + if ($container instanceof ElggGroup) { |
|
185 | 185 | if ($container->isPublicMembership() || $container->canEdit()) { |
186 | - echo '<button class="mrgn-tp-sm btn btn-primary" onclick = "join_comment('.$group->guid.',\''.$user->guid.'\',\'open\')">'.elgg_echo("groups:join").'</button>'; |
|
186 | + echo '<button class="mrgn-tp-sm btn btn-primary" onclick = "join_comment(' . $group->guid . ',\'' . $user->guid . '\',\'open\')">' . elgg_echo("groups:join") . '</button>'; |
|
187 | 187 | |
188 | 188 | } else { |
189 | 189 | // request membership |
190 | - echo '<button class="mrgn-tp-sm btn btn-primary" onclick = "join_comment('.$group->guid.',\''.$user->guid.'\',\'close\')">'.elgg_echo("groups:joinrequest").'</button>'; |
|
190 | + echo '<button class="mrgn-tp-sm btn btn-primary" onclick = "join_comment(' . $group->guid . ',\'' . $user->guid . '\',\'close\')">' . elgg_echo("groups:joinrequest") . '</button>'; |
|
191 | 191 | |
192 | 192 | } |
193 | 193 | } |
194 | 194 | |
195 | - echo elgg_view('input/submit', array('value' => elgg_echo('comment'), 'id' => 'comment_test','class' => 'mrgn-tp-sm btn', )); |
|
195 | + echo elgg_view('input/submit', array('value' => elgg_echo('comment'), 'id' => 'comment_test', 'class' => 'mrgn-tp-sm btn',)); |
|
196 | 196 | |
197 | 197 | ?> |
198 | 198 |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | |
50 | 50 | if(empty($entity)){ |
51 | 51 | $container = $comment->getContainerEntity(); |
52 | -}else{ |
|
52 | +} else{ |
|
53 | 53 | $container = $entity->getContainerEntity(); |
54 | 54 | } |
55 | 55 | |
@@ -88,7 +88,7 @@ discard block |
||
88 | 88 | |
89 | 89 | $submit_input = elgg_view('input/button', array('value' => elgg_echo('comment'), 'class' => 'mrgn-tp-sm btn btn-primary', 'data-target' => "#notif_comment", 'data-toggle' => "modal")); |
90 | 90 | |
91 | - }else{ |
|
91 | + } else{ |
|
92 | 92 | $submit_input = elgg_view('input/submit', array('value' => elgg_echo('comment'), 'class' => 'mrgn-tp-sm btn btn-primary', )); |
93 | 93 | |
94 | 94 | } |
@@ -18,7 +18,7 @@ |
||
18 | 18 | 'name' => 'username', |
19 | 19 | 'autofocus' => true, |
20 | 20 | 'required' => 'required', |
21 | - 'id' => 'username1', |
|
21 | + 'id' => 'username1', |
|
22 | 22 | )); |
23 | 23 | ?> |
24 | 24 | </div> |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | } |
33 | 33 | |
34 | 34 | if ( $json_desc ){ |
35 | - $vars['description2'] = $json_desc->fr; |
|
35 | + $vars['description2'] = $json_desc->fr; |
|
36 | 36 | $vars['description'] = $json_desc->en; |
37 | 37 | } |
38 | 38 | |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | $view_vars = array( |
84 | 84 | 'name' => $name, |
85 | 85 | 'value' => $vars[$name], |
86 | - 'id' => $name, |
|
86 | + 'id' => $name, |
|
87 | 87 | 'entity' => ($name == 'parent_guid') ? $vars['entity'] : null, |
88 | 88 | ); |
89 | 89 | |
@@ -120,10 +120,10 @@ discard block |
||
120 | 120 | // this view is used by both creating new page and edit new page |
121 | 121 | |
122 | 122 | echo "<h2>".elgg_echo('cp_notify:minor_edit_header')."</h2>"; |
123 | - echo '<div class="checkbox">'; |
|
124 | - echo elgg_view('input/checkboxes', array( |
|
123 | + echo '<div class="checkbox">'; |
|
124 | + echo elgg_view('input/checkboxes', array( |
|
125 | 125 | 'name' => 'chk_page_minor_edit', |
126 | - 'label'=>elgg_echo('page:minor_edit_label'), |
|
126 | + 'label'=>elgg_echo('page:minor_edit_label'), |
|
127 | 127 | 'id' => 'chk_page_minor_edit', |
128 | 128 | 'value' => 0, |
129 | 129 | 'options' => array( |
@@ -163,9 +163,9 @@ discard block |
||
163 | 163 | |
164 | 164 | |
165 | 165 | if($vars['guid']){ |
166 | - echo elgg_view('input/submit', array('value' => elgg_echo('save'), 'class' => 'btn btn-primary')); |
|
166 | + echo elgg_view('input/submit', array('value' => elgg_echo('save'), 'class' => 'btn btn-primary')); |
|
167 | 167 | } else { |
168 | - echo elgg_view('input/submit', array('value' => elgg_echo('page:create'), 'class' => 'btn btn-primary')); |
|
168 | + echo elgg_view('input/submit', array('value' => elgg_echo('page:create'), 'class' => 'btn btn-primary')); |
|
169 | 169 | } |
170 | 170 | |
171 | 171 |
@@ -26,20 +26,20 @@ discard block |
||
26 | 26 | $json_title = json_decode($title); |
27 | 27 | $json_desc = json_decode($desc); |
28 | 28 | |
29 | -if ( $json_title ){ |
|
29 | +if ($json_title) { |
|
30 | 30 | $vars['title2'] = $json_title->fr; |
31 | 31 | $vars['title'] = $json_title->en; |
32 | 32 | } |
33 | 33 | |
34 | -if ( $json_desc ){ |
|
34 | +if ($json_desc) { |
|
35 | 35 | $vars['description2'] = $json_desc->fr; |
36 | 36 | $vars['description'] = $json_desc->en; |
37 | 37 | } |
38 | 38 | |
39 | 39 | |
40 | -$btn_language = '<ul class="nav nav-tabs nav-tabs-language"> |
|
41 | - <li id="btnen"><a href="#" id="btnClicken">'.elgg_echo('lang:english').'</a></li> |
|
42 | - <li id="btnfr"><a href="#" id="btnClickfr">'.elgg_echo('lang:french').'</a></li> |
|
40 | +$btn_language = '<ul class="nav nav-tabs nav-tabs-language"> |
|
41 | + <li id="btnen"><a href="#" id="btnClicken">'.elgg_echo('lang:english') . '</a></li> |
|
42 | + <li id="btnfr"><a href="#" id="btnClickfr">'.elgg_echo('lang:french') . '</a></li> |
|
43 | 43 | </ul>'; |
44 | 44 | |
45 | 45 | echo $btn_language; |
@@ -61,13 +61,13 @@ discard block |
||
61 | 61 | } else { |
62 | 62 | $input_view = "input/$type"; |
63 | 63 | } |
64 | -if (($name == 'title2') || ($name == 'description2')){ |
|
64 | +if (($name == 'title2') || ($name == 'description2')) { |
|
65 | 65 | |
66 | 66 | echo '<div class="form-group fr">'; |
67 | - }elseif (($name == 'title') || ($name == 'description')){ |
|
67 | + }elseif (($name == 'title') || ($name == 'description')) { |
|
68 | 68 | |
69 | 69 | echo '<div class="form-group en">'; |
70 | - }else{ |
|
70 | + } else { |
|
71 | 71 | echo '<div class="form-group ">'; |
72 | 72 | } |
73 | 73 | ?> |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | if ($input_view === 'input/access' || $input_view === 'input/write_access') { |
92 | 92 | $view_vars['entity'] = $entity; |
93 | 93 | $view_vars['entity_type'] = 'object'; |
94 | - $view_vars['entity_subtype'] = $vars['parent_guid'] ? 'page': 'page_top'; |
|
94 | + $view_vars['entity_subtype'] = $vars['parent_guid'] ? 'page' : 'page_top'; |
|
95 | 95 | |
96 | 96 | if ($name === 'write_access_id') { |
97 | 97 | $view_vars['purpose'] = 'write'; |
@@ -119,7 +119,7 @@ discard block |
||
119 | 119 | // cyu - implement "minor edit" as per business requirements document |
120 | 120 | // this view is used by both creating new page and edit new page |
121 | 121 | |
122 | - echo "<h2>".elgg_echo('cp_notify:minor_edit_header')."</h2>"; |
|
122 | + echo "<h2>" . elgg_echo('cp_notify:minor_edit_header') . "</h2>"; |
|
123 | 123 | echo '<div class="checkbox">'; |
124 | 124 | echo elgg_view('input/checkboxes', array( |
125 | 125 | 'name' => 'chk_page_minor_edit', |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | |
163 | 163 | |
164 | 164 | |
165 | -if($vars['guid']){ |
|
165 | +if ($vars['guid']) { |
|
166 | 166 | echo elgg_view('input/submit', array('value' => elgg_echo('save'), 'class' => 'btn btn-primary')); |
167 | 167 | } else { |
168 | 168 | echo elgg_view('input/submit', array('value' => elgg_echo('page:create'), 'class' => 'btn btn-primary')); |
@@ -171,7 +171,7 @@ discard block |
||
171 | 171 | |
172 | 172 | echo'</div></div>'; |
173 | 173 | |
174 | -if(get_current_language() == 'fr'){ |
|
174 | +if (get_current_language() == 'fr') { |
|
175 | 175 | ?> |
176 | 176 | <script> |
177 | 177 | jQuery('.fr').show(); |
@@ -180,7 +180,7 @@ discard block |
||
180 | 180 | |
181 | 181 | </script> |
182 | 182 | <?php |
183 | -}else{ |
|
183 | +} else { |
|
184 | 184 | ?> |
185 | 185 | <script> |
186 | 186 | jQuery('.en').show(); |
@@ -64,10 +64,10 @@ discard block |
||
64 | 64 | if (($name == 'title2') || ($name == 'description2')){ |
65 | 65 | |
66 | 66 | echo '<div class="form-group fr">'; |
67 | - }elseif (($name == 'title') || ($name == 'description')){ |
|
67 | + } elseif (($name == 'title') || ($name == 'description')){ |
|
68 | 68 | |
69 | 69 | echo '<div class="form-group en">'; |
70 | - }else{ |
|
70 | + } else{ |
|
71 | 71 | echo '<div class="form-group ">'; |
72 | 72 | } |
73 | 73 | ?> |
@@ -135,8 +135,9 @@ discard block |
||
135 | 135 | * we need to make sure that we invoke sending notifcations only once, mark the second function as |
136 | 136 | * minor edit by default |
137 | 137 | */ |
138 | - if ($vars['new_entity']) |
|
139 | - $entity->entity_minor_edit = true; |
|
138 | + if ($vars['new_entity']) { |
|
139 | + $entity->entity_minor_edit = true; |
|
140 | + } |
|
140 | 141 | |
141 | 142 | echo '</div>'; |
142 | 143 | } |
@@ -180,7 +181,7 @@ discard block |
||
180 | 181 | |
181 | 182 | </script> |
182 | 183 | <?php |
183 | -}else{ |
|
184 | +} else{ |
|
184 | 185 | ?> |
185 | 186 | <script> |
186 | 187 | jQuery('.en').show(); |