Passed
Push — master ( e50590...85582e )
by Sarah
08:24 queued 06:20
created
views/user/layouts/main_auth.php 2 patches
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -81,8 +81,11 @@
 block discarded – undo
81 81
         <!-- start: show content (and check, if exists a sublayout -->
82 82
         <?php if (isset($this->subLayout) && $this->subLayout != "") : ?>
83 83
             <?php echo $this->renderPartial($this->subLayout, array('content' => $content)); ?>
84
-        <?php else: ?>
85
-            <?php echo $content; ?>
84
+        <?php else {
85
+    : ?>
86
+            <?php echo $content;
87
+}
88
+?>
86 89
         <?php endif; ?>
87 90
         <!-- end: show content -->
88 91
 
Please login to merge, or discard this patch.
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -14,19 +14,19 @@
 block discarded – undo
14 14
         <?php $ver = HVersion::VERSION; ?>
15 15
 
16 16
         <?php
17
-        Yii::app()->clientScript->registerCssFile(Yii::app()->baseUrl . '/css/animate.min.css');
18
-        Yii::app()->clientScript->registerCssFile(Yii::app()->baseUrl . '/css/bootstrap.min.css');
19
-        Yii::app()->clientScript->registerCssFile(Yii::app()->baseUrl . '/css/animate.min.css');
20
-        Yii::app()->clientScript->registerCssFile(Yii::app()->baseUrl . '/css/style.css');
21
-        Yii::app()->clientScript->registerCssFile(Yii::app()->baseUrl . '/css/flatelements.css');
22
-        Yii::app()->clientScript->registerCssFile(Yii::app()->baseUrl . '/resources/font-awesome/css/font-awesome.min.css');
23
-
24
-
25
-        Yii::app()->clientScript->registerScriptFile(Yii::app()->baseUrl . '/js/bootstrap.min.js');
26
-        Yii::app()->clientScript->registerScriptFile(Yii::app()->baseUrl . '/js/modernizr.js');
27
-        Yii::app()->clientScript->registerScriptFile(Yii::app()->baseUrl . '/js/jquery.cookie.js');
28
-        Yii::app()->clientScript->registerScriptFile(Yii::app()->baseUrl . '/js/jquery.flatelements.js');
29
-        Yii::app()->clientScript->registerScriptFile(Yii::app()->baseUrl . '/js/jquery.placeholder.js');
17
+        Yii::app()->clientScript->registerCssFile(Yii::app()->baseUrl.'/css/animate.min.css');
18
+        Yii::app()->clientScript->registerCssFile(Yii::app()->baseUrl.'/css/bootstrap.min.css');
19
+        Yii::app()->clientScript->registerCssFile(Yii::app()->baseUrl.'/css/animate.min.css');
20
+        Yii::app()->clientScript->registerCssFile(Yii::app()->baseUrl.'/css/style.css');
21
+        Yii::app()->clientScript->registerCssFile(Yii::app()->baseUrl.'/css/flatelements.css');
22
+        Yii::app()->clientScript->registerCssFile(Yii::app()->baseUrl.'/resources/font-awesome/css/font-awesome.min.css');
23
+
24
+
25
+        Yii::app()->clientScript->registerScriptFile(Yii::app()->baseUrl.'/js/bootstrap.min.js');
26
+        Yii::app()->clientScript->registerScriptFile(Yii::app()->baseUrl.'/js/modernizr.js');
27
+        Yii::app()->clientScript->registerScriptFile(Yii::app()->baseUrl.'/js/jquery.cookie.js');
28
+        Yii::app()->clientScript->registerScriptFile(Yii::app()->baseUrl.'/js/jquery.flatelements.js');
29
+        Yii::app()->clientScript->registerScriptFile(Yii::app()->baseUrl.'/js/jquery.placeholder.js');
30 30
         ?>
31 31
 
32 32
         <!-- The HTML5 shim, for IE6-8 support of HTML5 elements -->
Please login to merge, or discard this patch.
views/layouts/head.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,13 +1,13 @@
 block discarded – undo
1 1
 <!-- MAIN STYLE -->
2 2
 
3
-<link rel="stylesheet" type="text/css" media="screen" title="white-theme" href="<?php echo $this->theme->getBaseUrl() . '/css/theme.css'; ?>">
4
-<link rel="alternate stylesheet" type="text/css" media="screen" title="dark-theme" href="<?php echo $this->theme->getBaseUrl() . '/css/dark.css'; ?>">
3
+<link rel="stylesheet" type="text/css" media="screen" title="white-theme" href="<?php echo $this->theme->getBaseUrl().'/css/theme.css'; ?>">
4
+<link rel="alternate stylesheet" type="text/css" media="screen" title="dark-theme" href="<?php echo $this->theme->getBaseUrl().'/css/dark.css'; ?>">
5 5
 
6 6
 <!-- JS -->
7 7
 
8
-<script src="<?php echo $this->theme->getBaseUrl() . '/js/styleswitch.js'; ?>"></script>
8
+<script src="<?php echo $this->theme->getBaseUrl().'/js/styleswitch.js'; ?>"></script>
9 9
 
10 10
 <!-- OTHER --> 
11 11
 
12
-<link href="<?php echo $this->theme->getBaseUrl() . '/css/lightbox.css'; ?>" rel="stylesheet">
12
+<link href="<?php echo $this->theme->getBaseUrl().'/css/lightbox.css'; ?>" rel="stylesheet">
13 13
 <link href="https://fonts.googleapis.com/css?family=Open+Sans|PT+Sans|Rancho|Ubuntu+Condensed&subset=latin,cyrillic" rel="stylesheet" type="text/css">
Please login to merge, or discard this patch.
views/widgets/logo.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@
 block discarded – undo
10 10
     <?php endif; ?>
11 11
     <a class="navbar-brand" style="<?php if ($logo->hasImage()) : ?>display:none;<?php endif; ?> "
12 12
        href="<?php echo Yii::$app->homeUrl; ?>" id="text-logo">
13
-			<!-- <img src="<?php echo $this->theme->getBaseUrl() . '/img/logo.png'; ?>"></img> -->
13
+			<!-- <img src="<?php echo $this->theme->getBaseUrl().'/img/logo.png'; ?>"></img> -->
14 14
 			<?php echo Html::encode(Yii::$app->name); ?>
15 15
     </a>
16 16
 <?php endif; ?>
Please login to merge, or discard this patch.
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -20,7 +20,10 @@
 block discarded – undo
20 20
             <img src="<?php echo $logo->getUrl(); ?>" id="img-logo"/>
21 21
         </a>
22 22
         <br>
23
-    <?php else: ?>
24
-        <h1 id="app-title" class="animated fadeIn"><a href="<?php echo Yii::$app->homeUrl; ?>"><?php echo Html::encode(Yii::$app->name); ?></a></h1>
23
+    <?php else {
24
+    : ?>
25
+        <h1 id="app-title" class="animated fadeIn"><a href="<?php echo Yii::$app->homeUrl;
26
+}
27
+?>"><?php echo Html::encode(Yii::$app->name); ?></a></h1>
25 28
     <?php endif; ?>
26 29
 <?php endif; ?>
Please login to merge, or discard this patch.
views/comment/widgets/comments.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -12,11 +12,11 @@
 block discarded – undo
12 12
                 'label' => Yii::t('CommentModule.widgets_views_comments', 'Show all {total} comments.', array('{total}' => $total)),
13 13
                 'ajaxOptions' => [
14 14
                     'type' => 'POST',
15
-                    'success' => new yii\web\JsExpression("function(html) { $('#comments_area_" . $id . "').html(html); }"),
15
+                    'success' => new yii\web\JsExpression("function(html) { $('#comments_area_".$id."').html(html); }"),
16 16
                     'url' => Url::to(['/comment/comment/show', 'contentModel' => $modelName, 'contentId' => $modelId]),
17 17
                 ],
18 18
                 'htmlOptions' => [
19
-                    'id' => $id . "_showAllLink",
19
+                    'id' => $id."_showAllLink",
20 20
                     'class' => 'show show-all-link'
21 21
                 ],
22 22
                 'tag' => 'a'
Please login to merge, or discard this patch.
views/tour/widgets/tourPanel.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -7,16 +7,16 @@
 block discarded – undo
7 7
     <div class="panel panel-default panel-tour" id="getting-started-panel">
8 8
         <?php
9 9
         // Temporary workaround till panel widget rewrite in 0.10 verion
10
-        $removeOptionHtml = "<li>" . \humhub\widgets\ModalConfirm::widget(array(
10
+        $removeOptionHtml = "<li>".\humhub\widgets\ModalConfirm::widget(array(
11 11
                 'uniqueID' => 'hide-panel-button',
12 12
                 'title' => '<strong>Remove</strong> tour panel',
13 13
                 'message' => 'This action will remove the tour panel from your dashboard. You can reactivate it at<br>Account settings <i class="fa fa-caret-right"></i> Settings.',
14 14
                 'buttonTrue' => 'Ok',
15 15
                 'buttonFalse' => 'Cancel',
16
-                'linkContent' => '<i class="fa fa-eye-slash"></i> ' . Yii::t('TourModule.widgets_views_tourPanel', ' Remove panel'),
16
+                'linkContent' => '<i class="fa fa-eye-slash"></i> '.Yii::t('TourModule.widgets_views_tourPanel', ' Remove panel'),
17 17
                 'linkHref' => Url::to(["/tour/tour/hide-panel", "ajax" => 1]),
18 18
                 'confirmJS' => '$(".panel-tour").slideToggle("slow")'
19
-            ), true) . "</li>";
19
+            ), true)."</li>";
20 20
         ?>
21 21
  
22 22
         <!-- Display panel menu widget -->
Please login to merge, or discard this patch.
views/dashboard/widgets/share.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@  discard block
 block discarded – undo
2 2
 
3 3
 	<!-- STYLE -->
4 4
 
5
-	<link href="<?php echo $this->theme->getBaseUrl() . '/css/orbit.css'; ?>" rel="stylesheet">
5
+	<link href="<?php echo $this->theme->getBaseUrl().'/css/orbit.css'; ?>" rel="stylesheet">
6 6
 	
7 7
 	<!-- BLOCK -->
8 8
 
@@ -16,12 +16,12 @@  discard block
 block discarded – undo
16 16
 			--> 
17 17
 			
18 18
 			<div id="featured"> 
19
-				<img src="<?php echo $this->theme->getBaseUrl() . '/img/orbit/banner/1.jpg'; ?>" rel="caption-1" />
19
+				<img src="<?php echo $this->theme->getBaseUrl().'/img/orbit/banner/1.jpg'; ?>" rel="caption-1" />
20 20
 				<a href="http://humhub.com" target="_blank">
21
-					<img src="<?php echo $this->theme->getBaseUrl() . '/img/orbit/banner/2.jpg'; ?>" rel="caption-2" />
21
+					<img src="<?php echo $this->theme->getBaseUrl().'/img/orbit/banner/2.jpg'; ?>" rel="caption-2" />
22 22
 				</a>
23
-				<img src="<?php echo $this->theme->getBaseUrl() . '/img/orbit/banner/3.jpg'; ?>" rel="caption-3" />
24
-				<img src="<?php echo $this->theme->getBaseUrl() . '/img/orbit/banner/4.jpg'; ?>"  rel="caption-4" />
23
+				<img src="<?php echo $this->theme->getBaseUrl().'/img/orbit/banner/3.jpg'; ?>" rel="caption-3" />
24
+				<img src="<?php echo $this->theme->getBaseUrl().'/img/orbit/banner/4.jpg'; ?>"  rel="caption-4" />
25 25
 			</div>
26 26
 			
27 27
 			<!-- CAPTIONS -->
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 
35 35
 	<!-- JAVASCRIPT -->
36 36
 		
37
-	<script src="<?php echo $this->theme->getBaseUrl() . '/js/jquery.orbit.min.js'; ?>"></script>	
37
+	<script src="<?php echo $this->theme->getBaseUrl().'/js/jquery.orbit.min.js'; ?>"></script>	
38 38
 	<script type="text/javascript">
39 39
 		$(window).load(function() {
40 40
 			$('#featured').orbit({
Please login to merge, or discard this patch.
views/user/widgets/ProfileMenu.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
             'isActive' => (Yii::$app->controller->id == "profile" && Yii::$app->controller->action->id == "index"),
41 41
         ));
42 42
 
43
-          if (Yii::$app->getController()->getUser()->profile->about != "") {
43
+            if (Yii::$app->getController()->getUser()->profile->about != "") {
44 44
         $this->addItem(array(
45 45
             'label' => Yii::t('UserModule.widgets_ProfileMenuWidget', 'About'),
46 46
             'group' => 'profile',
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
             'sortOrder' => 300,
49 49
             'isActive' => (Yii::$app->controller->id == "profile" && Yii::$app->controller->action->id == "about"),
50 50
         ));
51
-          }
51
+            }
52 52
 
53 53
         parent::init();
54 54
     }
Please login to merge, or discard this patch.