public/static/css/rvr.css

@@ -385,6 +385,13 @@ main {
     padding: 6px 12px;
 }
 
+main.full {
+    position: relative;
+    width: 100%;
+    height: calc(100% - 40px);
+    padding: 0;
+}
+
 footer {
     background-color: #869ab9;
     padding: 3px 6px;
@@ -404,6 +411,20 @@ div.buttonContainer>button {
     margin: 0 auto;
 }
 
+#cookiesNotice {
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    right: 0;
+    margin: 20px;
+    background-color: #eeeeee;
+    border: solid #888888 1px;
+    border-radius: 3px;
+    padding: 10px;
+    text-align: center;
+    z-index: 10;
+}
+
 #loading {
     position: fixed;
     width: 64px;
@@ -425,6 +446,45 @@ div.box {
     box-sizing: border-box;
 }
 
+.circleControl {
+    position: absolute;
+    width: 60px;
+    bottom: 20px;
+    right: 10px;
+}
+
+.circleControl .controlItem {
+    position: relative;
+    height: 60px;
+    margin-top: 10px;
+    opacity: 70%;
+    cursor: pointer;
+}
+
+.circleControl .controlItem:hover {
+    opacity: 100%;
+}
+
+.circleControl .controlItem div {
+    position: absolute;
+    width: 100%;
+    height: 100%;
+}
+
+.circleControl .controlBackground {
+    width: 100%;
+    height: 100%;
+    opacity: 50%;
+}
+
+.circleControl .controlIcon {
+    width: 75%;
+    height: 75%;
+    margin: auto;
+    margin-top: 50%;
+    transform: translateY(-50%);
+}
+
 @media screen and (max-width: 599px) {
     header h1 span {
         display: none;
@@ -451,6 +511,12 @@ div.box {
     div.box {
         width: initial;
     }
+    .circleControl {
+        width: 45px;
+    }
+    .circleControl .controlItem {
+        height: 45px;
+    }
 }
 
 @media screen and (min-width: 600px) {
@@ -480,6 +546,12 @@ div.box {
         padding-top: 10px;
         padding-bottom: 10px;
     }
+    .circleControl {
+        width: 45px;
+    }
+    .circleControl .controlItem {
+        height: 45px;
+    }
 }
 
 @media screen and (min-height: 400px) and (max-height: 499px) {

public/static/js/rvr.js

@@ -1,5 +1,6 @@
 var RVR = {
     isSecure: window.location.protocol === 'https:',
+    cookiesAgreed: false,
     sessionAvailableHooks: {},
 
     initGoogleAnalitics: function () {

scripts/install.sh

@@ -9,6 +9,9 @@ if [ -f ${ROOT_DIR}/installed ]; then
     exit 1
 fi
 
+echo "Installing NPM packages..."
+(cd ${ROOT_DIR}/multi && npm install)
+
 echo "Installing Yarn packages..."
 (cd ${ROOT_DIR}/public/static && yarn install)
 

scripts/update.sh

@@ -11,6 +11,9 @@ else
     (cd ${ROOT_DIR} && composer install --dev)
 fi
 
+echo "Installing NPM packages..."
+(cd ${ROOT_DIR}/multi && npm install)
+
 echo "Installing Yarn packages..."
 (cd ${ROOT_DIR}/public/static && yarn install)
 

views/tests/view_complex.php

@@ -0,0 +1,22 @@
+@css(test1.css)
+@js(test1.js)
+@js(test2_<?= $some['expression'] ?>)
+
+@extra
+<?php phpinfo() ?>
+@endextra
+
+@extends(parent)
+
+@section(section1)
+<div>Test HTML with @extends - section 1</div>
+@endsection
+
+@section(section2)
+<div>Test HTML with @extends - section 2</div>
+@endsection
+
+@extra
+<?php $a = 'test_string' ?>
+EXTRA
+@endextra

views/tests/view_invalid_multiple_extends.php

@@ -0,0 +1,5 @@
+@extends(parent1)
+
+@extends(parent2)
+
+<div>Test HTML with multiple @extends</div>

views/tests/view_invalid_multiple_sections_open.php

@@ -0,0 +1,6 @@
+@extends(parent)
+
+@section(section1)
+@section(section2)
+
+<div>Test HTML with opening @section before previous closed</div>

views/tests/view_invalid_section_not_open.php

@@ -0,0 +1,4 @@
+@extends(parent)
+
+<div>Test HTML with @endsection when no section is open</div>
+@endsection

views/tests/view_invalid_section_without_extends.php

@@ -0,0 +1,3 @@
+@section(section1)
+
+<div>Test HTML with @section but without @extends</div>

views/tests/view_with_assets.php

@@ -0,0 +1,4 @@
+@css(test.css)
+@js(test.js)
+@js(test_<?= $some['expression'] ?>)
+<div>Test HTML with @css and @js</div>

views/tests/view_with_extends.php

@@ -0,0 +1,5 @@
+@extends(parent)
+
+@section(section1)
+<div>Test HTML with @extends</div>
+@endsection

views/tests/view_without_extends.php

@@ -0,0 +1 @@
+<div>Test HTML without @extends</div>