09.02.16

Administrator
1 parent 405c1458
Showing 3 changed files with 23 additions and 18 deletions Show diff stats
composer.lock
frontend/views/accounts/setting.php
frontend/views/layouts/admin.php
@@ -363,12 +363,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/cebe/markdown.git",
-                "reference": "d7b6f46cd423174c8a86c7f816dea45008dbf454"
+                "reference": "e4499350d8a94c4c693a7e784295eff7a717ae67"
             },
             "dist": {
                 "type": "zip",
                 "url": "https://api.github.com/repos/cebe/markdown/zipball/e4499350d8a94c4c693a7e784295eff7a717ae67",
-                "reference": "d7b6f46cd423174c8a86c7f816dea45008dbf454",
+                "reference": "e4499350d8a94c4c693a7e784295eff7a717ae67",
                 "shasum": ""
             },
             "require": {
@@ -415,7 +415,7 @@
                 "markdown",
                 "markdown-extra"
             ],
-            "time": "2016-01-21 11:46:58"
+            "time": "2016-02-09 22:09:46"
         },
         {
             "name": "cebe/yii2-gravatar",
@@ -1177,26 +1177,26 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/yiisoft/yii2-framework.git",
-                "reference": "7ccbfdf4cfb0ce025e27455dc3e516af23eb2800"
+                "reference": "abb6d386b71fe4d30d028c293202223311162dd2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/yiisoft/yii2-framework/zipball/1800d3840b098fc6e936852fa84b8c1b1a0a2e57",
-                "reference": "7ccbfdf4cfb0ce025e27455dc3e516af23eb2800",
+                "url": "https://api.github.com/repos/yiisoft/yii2-framework/zipball/abb6d386b71fe4d30d028c293202223311162dd2",
+                "reference": "abb6d386b71fe4d30d028c293202223311162dd2",
                 "shasum": ""
             },
             "require": {
-                "bower-asset/jquery": "2.1.*@stable | 1.11.*@stable",
+                "bower-asset/jquery": "2.2.*@stable | 2.1.*@stable | 1.11.*@stable",
                 "bower-asset/jquery.inputmask": "~3.2.2",
                 "bower-asset/punycode": "1.3.*",
-                "bower-asset/yii2-pjax": ">=2.0.1",
+                "bower-asset/yii2-pjax": "~2.0.1",
                 "cebe/markdown": "~1.0.0 | ~1.1.0",
                 "ext-ctype": "*",
                 "ext-mbstring": "*",
                 "ezyang/htmlpurifier": "4.6.*",
                 "lib-pcre": "*",
                 "php": ">=5.4.0",
-                "yiisoft/yii2-composer": "*"
+                "yiisoft/yii2-composer": "~2.0.4"
             },
             "bin": [
                 "yii"
@@ -1263,7 +1263,7 @@
                 "framework",
                 "yii2"
             ],
-            "time": "2016-01-28 20:15:10"
+            "time": "2016-02-11 15:39:25"
         },
         {
             "name": "yiisoft/yii2-bootstrap",
@@ -1545,12 +1545,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/fzaninotto/Faker.git",
-                "reference": "b312ab9d0c446971069e22a524fec01c7cddc75e"
+                "reference": "772feacf6849bf0114873e2b869bb500fccfd438"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/ff1d463edb2c74e39f4ec76f7eb99fd47b237507",
-                "reference": "b312ab9d0c446971069e22a524fec01c7cddc75e",
+                "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/772feacf6849bf0114873e2b869bb500fccfd438",
+                "reference": "772feacf6849bf0114873e2b869bb500fccfd438",
                 "shasum": ""
             },
             "require": {
@@ -1587,7 +1587,7 @@
                 "faker",
                 "fixtures"
             ],
-            "time": "2016-02-01 17:08:46"
+            "time": "2016-02-11 12:29:31"
         },
         {
             "name": "phpspec/php-diff",
@@ -24,7 +24,7 @@
             </button>
             <p><?= \Yii::$app->session->getFlash ('passwordupdate') ?></p>
         </div>
-        <?
+        <?php
     }
     $form = ActiveForm::begin ();
 ?>
@@ -56,8 +56,9 @@
 <div class="input-blocks-wrapper">
     <div class="admin-save-btn skills-save-btn line-btn-fix style">
         <?= Html::submitButton ('Обновить', ['class' => 'btn btn-primary']);
-            $form->end ();
+
         ?>
+        <?php  $form->end (); ?>
     </div>
 </div>
  
@@ -68,8 +68,12 @@ $this-&gt;beginContent(&#39;@app/views/layouts/main.php&#39;);
                                             'url' => ['accounts/blog'],
                                         ],
                                         [
-                                            'label' => 'Галерея',
-                                            'url' => ['accounts/gallery-create'],
+                                            'label' => 'Галерея Изображения',
+                                            'url' => ['accounts/gallery'],
+                                        ],
+                                        [
+                                            'label' => 'Галерея Видео',
+                                            'url' => ['accounts/gallery-video'],
                                         ],
                                         [
                                             'label' => 'Сообщения',