Administrator / baucenter

Commit 85756013cbd9b77224393b2e5838d6326ba963b4

Authored by Karnovsky A
2 parents 550f051a 885643b4

Merge branch 'master' of gitlab.artweb.com.ua:root/baucenter 

# Conflicts:
#	backend/views/layouts/main-sidebar.php
Showing 13 changed files with 588 additions and 276 deletions   Show diff stats
Inline Side-by-side
backend/views/layouts/header.php
  Show/Hide comments   View file @8575601
... ... @@ -13,248 +13,248 @@
13 13 <span class="sr-only">Toggle navigation</span>
14 14 </a>
15 15  
16   - <div class="navbar-custom-menu">
17   - <ul class="nav navbar-nav">
18   - <!-- Messages: style can be found in dropdown.less-->
19   - <li class="dropdown messages-menu">
20   - <a href="#" class="dropdown-toggle" data-toggle="dropdown">
21   - <i class="fa fa-envelope-o"></i>
22   - <span class="label label-success">4</span>
23   - </a>
24   - <ul class="dropdown-menu">
25   - <li class="header">You have 4 messages</li>
26   - <li>
27   - <!-- inner menu: contains the actual data -->
28   - <ul class="menu">
29   - <li><!-- start message -->
30   - <a href="#">
31   - <div class="pull-left">
32   - <img src="dist/img/user2-160x160.jpg" class="img-circle" alt="User Image">
33   - </div>
34   - <h4>
35   - Support Team
36   - <small><i class="fa fa-clock-o"></i> 5 mins</small>
37   - </h4>
38   - <p>Why not buy a new awesome theme?</p>
39   - </a>
40   - </li>
41   - <!-- end message -->
42   - <li>
43   - <a href="#">
44   - <div class="pull-left">
45   - <img src="dist/img/user3-128x128.jpg" class="img-circle" alt="User Image">
46   - </div>
47   - <h4>
48   - AdminLTE Design Team
49   - <small><i class="fa fa-clock-o"></i> 2 hours</small>
50   - </h4>
51   - <p>Why not buy a new awesome theme?</p>
52   - </a>
53   - </li>
54   - <li>
55   - <a href="#">
56   - <div class="pull-left">
57   - <img src="dist/img/user4-128x128.jpg" class="img-circle" alt="User Image">
58   - </div>
59   - <h4>
60   - Developers
61   - <small><i class="fa fa-clock-o"></i> Today</small>
62   - </h4>
63   - <p>Why not buy a new awesome theme?</p>
64   - </a>
65   - </li>
66   - <li>
67   - <a href="#">
68   - <div class="pull-left">
69   - <img src="dist/img/user3-128x128.jpg" class="img-circle" alt="User Image">
70   - </div>
71   - <h4>
72   - Sales Department
73   - <small><i class="fa fa-clock-o"></i> Yesterday</small>
74   - </h4>
75   - <p>Why not buy a new awesome theme?</p>
76   - </a>
77   - </li>
78   - <li>
79   - <a href="#">
80   - <div class="pull-left">
81   - <img src="dist/img/user4-128x128.jpg" class="img-circle" alt="User Image">
82   - </div>
83   - <h4>
84   - Reviewers
85   - <small><i class="fa fa-clock-o"></i> 2 days</small>
86   - </h4>
87   - <p>Why not buy a new awesome theme?</p>
88   - </a>
89   - </li>
90   - </ul>
91   - </li>
92   - <li class="footer"><a href="#">See All Messages</a></li>
93   - </ul>
94   - </li>
95   - <!-- Notifications: style can be found in dropdown.less -->
96   - <li class="dropdown notifications-menu">
97   - <a href="#" class="dropdown-toggle" data-toggle="dropdown">
98   - <i class="fa fa-bell-o"></i>
99   - <span class="label label-warning">10</span>
100   - </a>
101   - <ul class="dropdown-menu">
102   - <li class="header">You have 10 notifications</li>
103   - <li>
104   - <!-- inner menu: contains the actual data -->
105   - <ul class="menu">
106   - <li>
107   - <a href="#">
108   - <i class="fa fa-users text-aqua"></i> 5 new members joined today
109   - </a>
110   - </li>
111   - <li>
112   - <a href="#">
113   - <i class="fa fa-warning text-yellow"></i> Very long description here that may not fit into the
114   - page and may cause design problems
115   - </a>
116   - </li>
117   - <li>
118   - <a href="#">
119   - <i class="fa fa-users text-red"></i> 5 new members joined
120   - </a>
121   - </li>
122   - <li>
123   - <a href="#">
124   - <i class="fa fa-shopping-cart text-green"></i> 25 sales made
125   - </a>
126   - </li>
127   - <li>
128   - <a href="#">
129   - <i class="fa fa-user text-red"></i> You changed your username
130   - </a>
131   - </li>
132   - </ul>
133   - </li>
134   - <li class="footer"><a href="#">View all</a></li>
135   - </ul>
136   - </li>
137   - <!-- Tasks: style can be found in dropdown.less -->
138   - <li class="dropdown tasks-menu">
139   - <a href="#" class="dropdown-toggle" data-toggle="dropdown">
140   - <i class="fa fa-flag-o"></i>
141   - <span class="label label-danger">9</span>
142   - </a>
143   - <ul class="dropdown-menu">
144   - <li class="header">You have 9 tasks</li>
145   - <li>
146   - <!-- inner menu: contains the actual data -->
147   - <ul class="menu">
148   - <li><!-- Task item -->
149   - <a href="#">
150   - <h3>
151   - Design some buttons
152   - <small class="pull-right">20%</small>
153   - </h3>
154   - <div class="progress xs">
155   - <div class="progress-bar progress-bar-aqua" style="width: 20%" role="progressbar" aria-valuenow="20" aria-valuemin="0" aria-valuemax="100">
156   - <span class="sr-only">20% Complete</span>
157   - </div>
158   - </div>
159   - </a>
160   - </li>
161   - <!-- end task item -->
162   - <li><!-- Task item -->
163   - <a href="#">
164   - <h3>
165   - Create a nice theme
166   - <small class="pull-right">40%</small>
167   - </h3>
168   - <div class="progress xs">
169   - <div class="progress-bar progress-bar-green" style="width: 40%" role="progressbar" aria-valuenow="20" aria-valuemin="0" aria-valuemax="100">
170   - <span class="sr-only">40% Complete</span>
171   - </div>
172   - </div>
173   - </a>
174   - </li>
175   - <!-- end task item -->
176   - <li><!-- Task item -->
177   - <a href="#">
178   - <h3>
179   - Some task I need to do
180   - <small class="pull-right">60%</small>
181   - </h3>
182   - <div class="progress xs">
183   - <div class="progress-bar progress-bar-red" style="width: 60%" role="progressbar" aria-valuenow="20" aria-valuemin="0" aria-valuemax="100">
184   - <span class="sr-only">60% Complete</span>
185   - </div>
186   - </div>
187   - </a>
188   - </li>
189   - <!-- end task item -->
190   - <li><!-- Task item -->
191   - <a href="#">
192   - <h3>
193   - Make beautiful transitions
194   - <small class="pull-right">80%</small>
195   - </h3>
196   - <div class="progress xs">
197   - <div class="progress-bar progress-bar-yellow" style="width: 80%" role="progressbar" aria-valuenow="20" aria-valuemin="0" aria-valuemax="100">
198   - <span class="sr-only">80% Complete</span>
199   - </div>
200   - </div>
201   - </a>
202   - </li>
203   - <!-- end task item -->
204   - </ul>
205   - </li>
206   - <li class="footer">
207   - <a href="#">View all tasks</a>
208   - </li>
209   - </ul>
210   - </li>
211   - <!-- User Account: style can be found in dropdown.less -->
212   - <li class="dropdown user user-menu">
213   - <a href="#" class="dropdown-toggle" data-toggle="dropdown">
214   - <!--img src="dist/img/user2-160x160.jpg" class="user-image" alt="User Image"-->
215   - <span class="hidden-xs">Alexander Pierce</span>
216   - </a>
217   - <ul class="dropdown-menu">
218   - <!-- User image -->
219   - <li class="user-header">
220   - <img src="dist/img/user2-160x160.jpg" class="img-circle" alt="User Image">
221   -
222   - <p>
223   - Alexander Pierce - Web Developer
224   - <small>Member since Nov. 2012</small>
225   - </p>
226   - </li>
227   - <!-- Menu Body -->
228   - <li class="user-body">
229   - <div class="row">
230   - <div class="col-xs-4 text-center">
231   - <a href="#">Followers</a>
232   - </div>
233   - <div class="col-xs-4 text-center">
234   - <a href="#">Sales</a>
235   - </div>
236   - <div class="col-xs-4 text-center">
237   - <a href="#">Friends</a>
238   - </div>
239   - </div>
240   - <!-- /.row -->
241   - </li>
242   - <!-- Menu Footer-->
243   - <li class="user-footer">
244   - <div class="pull-left">
245   - <a href="#" class="btn btn-default btn-flat">Profile</a>
246   - </div>
247   - <div class="pull-right">
248   - <a href="#" class="btn btn-default btn-flat">Sign out</a>
249   - </div>
250   - </li>
251   - </ul>
252   - </li>
253   - <!-- Control Sidebar Toggle Button -->
254   - <li>
255   - <a href="#" data-toggle="control-sidebar"><i class="fa fa-gears"></i></a>
256   - </li>
257   - </ul>
258   - </div>
  16 +<!-- <div class="navbar-custom-menu">-->
  17 +<!-- <ul class="nav navbar-nav">-->
  18 +<!-- <!-- Messages: style can be found in dropdown.less-->
  19 +<!-- <li class="dropdown messages-menu">-->
  20 +<!-- <a href="#" class="dropdown-toggle" data-toggle="dropdown">-->
  21 +<!-- <i class="fa fa-envelope-o"></i>-->
  22 +<!-- <span class="label label-success">4</span>-->
  23 +<!-- </a>-->
  24 +<!-- <ul class="dropdown-menu">-->
  25 +<!-- <li class="header">You have 4 messages</li>-->
  26 +<!-- <li>-->
  27 +<!-- <!-- inner menu: contains the actual data -->
  28 +<!-- <ul class="menu">-->
  29 +<!-- <li><!-- start message -->
  30 +<!-- <a href="#">-->
  31 +<!-- <div class="pull-left">-->
  32 +<!-- <img src="dist/img/user2-160x160.jpg" class="img-circle" alt="User Image">-->
  33 +<!-- </div>-->
  34 +<!-- <h4>-->
  35 +<!-- Support Team-->
  36 +<!-- <small><i class="fa fa-clock-o"></i> 5 mins</small>-->
  37 +<!-- </h4>-->
  38 +<!-- <p>Why not buy a new awesome theme?</p>-->
  39 +<!-- </a>-->
  40 +<!-- </li>-->
  41 +<!-- <!-- end message -->
  42 +<!-- <li>-->
  43 +<!-- <a href="#">-->
  44 +<!-- <div class="pull-left">-->
  45 +<!-- <img src="dist/img/user3-128x128.jpg" class="img-circle" alt="User Image">-->
  46 +<!-- </div>-->
  47 +<!-- <h4>-->
  48 +<!-- AdminLTE Design Team-->
  49 +<!-- <small><i class="fa fa-clock-o"></i> 2 hours</small>-->
  50 +<!-- </h4>-->
  51 +<!-- <p>Why not buy a new awesome theme?</p>-->
  52 +<!-- </a>-->
  53 +<!-- </li>-->
  54 +<!-- <li>-->
  55 +<!-- <a href="#">-->
  56 +<!-- <div class="pull-left">-->
  57 +<!-- <img src="dist/img/user4-128x128.jpg" class="img-circle" alt="User Image">-->
  58 +<!-- </div>-->
  59 +<!-- <h4>-->
  60 +<!-- Developers-->
  61 +<!-- <small><i class="fa fa-clock-o"></i> Today</small>-->
  62 +<!-- </h4>-->
  63 +<!-- <p>Why not buy a new awesome theme?</p>-->
  64 +<!-- </a>-->
  65 +<!-- </li>-->
  66 +<!-- <li>-->
  67 +<!-- <a href="#">-->
  68 +<!-- <div class="pull-left">-->
  69 +<!-- <img src="dist/img/user3-128x128.jpg" class="img-circle" alt="User Image">-->
  70 +<!-- </div>-->
  71 +<!-- <h4>-->
  72 +<!-- Sales Department-->
  73 +<!-- <small><i class="fa fa-clock-o"></i> Yesterday</small>-->
  74 +<!-- </h4>-->
  75 +<!-- <p>Why not buy a new awesome theme?</p>-->
  76 +<!-- </a>-->
  77 +<!-- </li>-->
  78 +<!-- <li>-->
  79 +<!-- <a href="#">-->
  80 +<!-- <div class="pull-left">-->
  81 +<!-- <img src="dist/img/user4-128x128.jpg" class="img-circle" alt="User Image">-->
  82 +<!-- </div>-->
  83 +<!-- <h4>-->
  84 +<!-- Reviewers-->
  85 +<!-- <small><i class="fa fa-clock-o"></i> 2 days</small>-->
  86 +<!-- </h4>-->
  87 +<!-- <p>Why not buy a new awesome theme?</p>-->
  88 +<!-- </a>-->
  89 +<!-- </li>-->
  90 +<!-- </ul>-->
  91 +<!-- </li>-->
  92 +<!-- <li class="footer"><a href="#">See All Messages</a></li>-->
  93 +<!-- </ul>-->
  94 +<!-- </li>-->
  95 +<!-- <!-- Notifications: style can be found in dropdown.less -->
  96 +<!-- <li class="dropdown notifications-menu">-->
  97 +<!-- <a href="#" class="dropdown-toggle" data-toggle="dropdown">-->
  98 +<!-- <i class="fa fa-bell-o"></i>-->
  99 +<!-- <span class="label label-warning">10</span>-->
  100 +<!-- </a>-->
  101 +<!-- <ul class="dropdown-menu">-->
  102 +<!-- <li class="header">You have 10 notifications</li>-->
  103 +<!-- <li>-->
  104 +<!-- <!-- inner menu: contains the actual data -->
  105 +<!-- <ul class="menu">-->
  106 +<!-- <li>-->
  107 +<!-- <a href="#">-->
  108 +<!-- <i class="fa fa-users text-aqua"></i> 5 new members joined today-->
  109 +<!-- </a>-->
  110 +<!-- </li>-->
  111 +<!-- <li>-->
  112 +<!-- <a href="#">-->
  113 +<!-- <i class="fa fa-warning text-yellow"></i> Very long description here that may not fit into the-->
  114 +<!-- page and may cause design problems-->
  115 +<!-- </a>-->
  116 +<!-- </li>-->
  117 +<!-- <li>-->
  118 +<!-- <a href="#">-->
  119 +<!-- <i class="fa fa-users text-red"></i> 5 new members joined-->
  120 +<!-- </a>-->
  121 +<!-- </li>-->
  122 +<!-- <li>-->
  123 +<!-- <a href="#">-->
  124 +<!-- <i class="fa fa-shopping-cart text-green"></i> 25 sales made-->
  125 +<!-- </a>-->
  126 +<!-- </li>-->
  127 +<!-- <li>-->
  128 +<!-- <a href="#">-->
  129 +<!-- <i class="fa fa-user text-red"></i> You changed your username-->
  130 +<!-- </a>-->
  131 +<!-- </li>-->
  132 +<!-- </ul>-->
  133 +<!-- </li>-->
  134 +<!-- <li class="footer"><a href="#">View all</a></li>-->
  135 +<!-- </ul>-->
  136 +<!-- </li>-->
  137 +<!-- <!-- Tasks: style can be found in dropdown.less -->
  138 +<!-- <li class="dropdown tasks-menu">-->
  139 +<!-- <a href="#" class="dropdown-toggle" data-toggle="dropdown">-->
  140 +<!-- <i class="fa fa-flag-o"></i>-->
  141 +<!-- <span class="label label-danger">9</span>-->
  142 +<!-- </a>-->
  143 +<!-- <ul class="dropdown-menu">-->
  144 +<!-- <li class="header">You have 9 tasks</li>-->
  145 +<!-- <li>-->
  146 +<!-- <!-- inner menu: contains the actual data -->
  147 +<!-- <ul class="menu">-->
  148 +<!-- <li><!-- Task item -->
  149 +<!-- <a href="#">-->
  150 +<!-- <h3>-->
  151 +<!-- Design some buttons-->
  152 +<!-- <small class="pull-right">20%</small>-->
  153 +<!-- </h3>-->
  154 +<!-- <div class="progress xs">-->
  155 +<!-- <div class="progress-bar progress-bar-aqua" style="width: 20%" role="progressbar" aria-valuenow="20" aria-valuemin="0" aria-valuemax="100">-->
  156 +<!-- <span class="sr-only">20% Complete</span>-->
  157 +<!-- </div>-->
  158 +<!-- </div>-->
  159 +<!-- </a>-->
  160 +<!-- </li>-->
  161 +<!-- <!-- end task item -->
  162 +<!-- <li><!-- Task item -->
  163 +<!-- <a href="#">-->
  164 +<!-- <h3>-->
  165 +<!-- Create a nice theme-->
  166 +<!-- <small class="pull-right">40%</small>-->
  167 +<!-- </h3>-->
  168 +<!-- <div class="progress xs">-->
  169 +<!-- <div class="progress-bar progress-bar-green" style="width: 40%" role="progressbar" aria-valuenow="20" aria-valuemin="0" aria-valuemax="100">-->
  170 +<!-- <span class="sr-only">40% Complete</span>-->
  171 +<!-- </div>-->
  172 +<!-- </div>-->
  173 +<!-- </a>-->
  174 +<!-- </li>-->
  175 +<!-- <!-- end task item -->
  176 +<!-- <li><!-- Task item -->
  177 +<!-- <a href="#">-->
  178 +<!-- <h3>-->
  179 +<!-- Some task I need to do-->
  180 +<!-- <small class="pull-right">60%</small>-->
  181 +<!-- </h3>-->
  182 +<!-- <div class="progress xs">-->
  183 +<!-- <div class="progress-bar progress-bar-red" style="width: 60%" role="progressbar" aria-valuenow="20" aria-valuemin="0" aria-valuemax="100">-->
  184 +<!-- <span class="sr-only">60% Complete</span>-->
  185 +<!-- </div>-->
  186 +<!-- </div>-->
  187 +<!-- </a>-->
  188 +<!-- </li>-->
  189 +<!-- <!-- end task item -->
  190 +<!-- <li><!-- Task item -->
  191 +<!-- <a href="#">-->
  192 +<!-- <h3>-->
  193 +<!-- Make beautiful transitions-->
  194 +<!-- <small class="pull-right">80%</small>-->
  195 +<!-- </h3>-->
  196 +<!-- <div class="progress xs">-->
  197 +<!-- <div class="progress-bar progress-bar-yellow" style="width: 80%" role="progressbar" aria-valuenow="20" aria-valuemin="0" aria-valuemax="100">-->
  198 +<!-- <span class="sr-only">80% Complete</span>-->
  199 +<!-- </div>-->
  200 +<!-- </div>-->
  201 +<!-- </a>-->
  202 +<!-- </li>-->
  203 +<!-- <!-- end task item -->
  204 +<!-- </ul>-->
  205 +<!-- </li>-->
  206 +<!-- <li class="footer">-->
  207 +<!-- <a href="#">View all tasks</a>-->
  208 +<!-- </li>-->
  209 +<!-- </ul>-->
  210 +<!-- </li>-->
  211 +<!-- <!-- User Account: style can be found in dropdown.less -->
  212 +<!-- <li class="dropdown user user-menu">-->
  213 +<!-- <a href="#" class="dropdown-toggle" data-toggle="dropdown">-->
  214 +<!-- <!--img src="dist/img/user2-160x160.jpg" class="user-image" alt="User Image"-->
  215 +<!-- <span class="hidden-xs">Alexander Pierce</span>-->
  216 +<!-- </a>-->
  217 +<!-- <ul class="dropdown-menu">-->
  218 +<!-- <!-- User image -->
  219 +<!-- <li class="user-header">-->
  220 +<!-- <img src="dist/img/user2-160x160.jpg" class="img-circle" alt="User Image">-->
  221 +<!---->
  222 +<!-- <p>-->
  223 +<!-- Alexander Pierce - Web Developer-->
  224 +<!-- <small>Member since Nov. 2012</small>-->
  225 +<!-- </p>-->
  226 +<!-- </li>-->
  227 +<!-- <!-- Menu Body -->
  228 +<!-- <li class="user-body">-->
  229 +<!-- <div class="row">-->
  230 +<!-- <div class="col-xs-4 text-center">-->
  231 +<!-- <a href="#">Followers</a>-->
  232 +<!-- </div>-->
  233 +<!-- <div class="col-xs-4 text-center">-->
  234 +<!-- <a href="#">Sales</a>-->
  235 +<!-- </div>-->
  236 +<!-- <div class="col-xs-4 text-center">-->
  237 +<!-- <a href="#">Friends</a>-->
  238 +<!-- </div>-->
  239 +<!-- </div>-->
  240 +<!-- <!-- /.row -->
  241 +<!-- </li>-->
  242 +<!-- <!-- Menu Footer-->
  243 +<!-- <li class="user-footer">-->
  244 +<!-- <div class="pull-left">-->
  245 +<!-- <a href="#" class="btn btn-default btn-flat">Profile</a>-->
  246 +<!-- </div>-->
  247 +<!-- <div class="pull-right">-->
  248 +<!-- <a href="#" class="btn btn-default btn-flat">Sign out</a>-->
  249 +<!-- </div>-->
  250 +<!-- </li>-->
  251 +<!-- </ul>-->
  252 +<!-- </li>-->
  253 +<!-- <!-- Control Sidebar Toggle Button -->
  254 +<!-- <li>-->
  255 +<!-- <a href="#" data-toggle="control-sidebar"><i class="fa fa-gears"></i></a>-->
  256 +<!-- </li>-->
  257 +<!-- </ul>-->
  258 +<!-- </div>-->
259 259 </nav>
260 260 </header>
261 261 \ No newline at end of file
... ...
composer.json
  Show/Hide comments   View file @8575601
... ... @@ -5,6 +5,9 @@
5 5 "homepage": "http://www.yiiframework.com/",
6 6 "type": "project",
7 7 "license": "BSD-3-Clause",
  8 + "platform": {
  9 + "php": "5.5.0"
  10 + },
8 11 "support": {
9 12 "issues": "https://github.com/yiisoft/yii2/issues?state=open",
10 13 "forum": "http://www.yiiframework.com/forum/",
... ...
composer.lock
  Show/Hide comments   View file @8575601
... ... @@ -284,16 +284,16 @@
284 284 },
285 285 {
286 286 "name": "bower-asset/jquery",
287   - "version": "2.2.2",
  287 + "version": "2.2.3",
288 288 "source": {
289 289 "type": "git",
290 290 "url": "https://github.com/jquery/jquery-dist.git",
291   - "reference": "086d381cd2f3b4b8b0af85ecb2c9593a61e5b4bd"
  291 + "reference": "af22a351b2ea5801ffb1695abb3bb34d5bed9198"
292 292 },
293 293 "dist": {
294 294 "type": "zip",
295   - "url": "https://api.github.com/repos/jquery/jquery-dist/zipball/086d381cd2f3b4b8b0af85ecb2c9593a61e5b4bd",
296   - "reference": "086d381cd2f3b4b8b0af85ecb2c9593a61e5b4bd",
  295 + "url": "https://api.github.com/repos/jquery/jquery-dist/zipball/af22a351b2ea5801ffb1695abb3bb34d5bed9198",
  296 + "reference": "af22a351b2ea5801ffb1695abb3bb34d5bed9198",
297 297 "shasum": ""
298 298 },
299 299 "type": "bower-asset-library",
... ... @@ -1033,16 +1033,16 @@
1033 1033 },
1034 1034 {
1035 1035 "name": "guzzlehttp/psr7",
1036   - "version": "1.2.3",
  1036 + "version": "1.3.0",
1037 1037 "source": {
1038 1038 "type": "git",
1039 1039 "url": "https://github.com/guzzle/psr7.git",
1040   - "reference": "2e89629ff057ebb49492ba08e6995d3a6a80021b"
  1040 + "reference": "31382fef2889136415751badebbd1cb022a4ed72"
1041 1041 },
1042 1042 "dist": {
1043 1043 "type": "zip",
1044   - "url": "https://api.github.com/repos/guzzle/psr7/zipball/2e89629ff057ebb49492ba08e6995d3a6a80021b",
1045   - "reference": "2e89629ff057ebb49492ba08e6995d3a6a80021b",
  1044 + "url": "https://api.github.com/repos/guzzle/psr7/zipball/31382fef2889136415751badebbd1cb022a4ed72",
  1045 + "reference": "31382fef2889136415751badebbd1cb022a4ed72",
1046 1046 "shasum": ""
1047 1047 },
1048 1048 "require": {
... ... @@ -1087,7 +1087,7 @@
1087 1087 "stream",
1088 1088 "uri"
1089 1089 ],
1090   - "time": "2016-02-18 21:54:00"
  1090 + "time": "2016-04-13 19:56:01"
1091 1091 },
1092 1092 {
1093 1093 "name": "imagine/imagine",
... ...
frontend/controllers/SiteController.php
  Show/Hide comments   View file @8575601
... ... @@ -94,16 +94,26 @@ class SiteController extends Controller
94 94  
95 95  
96 96 public function actionMail(){
97   - $num = Yii::$app->request->post('num');
  97 +
98 98 $type = Yii::$app->request->post('type');
99 99  
100 100 switch ($type) {
101 101 case 'call_me':
  102 + $num = Yii::$app->request->post('num');
102 103 if(!empty($num)){
103 104 return json_encode(Mailer::widget(['text' => $num, 'subject' => 'Обратный звонок']));
104 105 }
105 106  
106 107 break;
  108 + case "consultation":
  109 + $num = Yii::$app->request->post('num');
  110 + $name = Yii::$app->request->post('name');
  111 +
  112 + if(!empty($num)){
  113 + return json_encode(Mailer::widget(['text' => "Номер телефона".$num.";<br>Имя:".$name, 'subject' => 'Обратный звонок']));
  114 + }
  115 + break;
  116 +
107 117  
108 118 }
109 119 }
... ...
frontend/views/event/_objects.php
  Show/Hide comments   View file @8575601
... ... @@ -29,7 +29,7 @@ use yii\helpers\Url;
29 29 <tbody>
30 30 <tr>
31 31 <td height="25"><img src="/images/ico-2.jpg" alt=""></td>
32   - <td height="25"></td><td><a data-toggle="modal" href="#registrationFormModal" style="margin-left: 11px; font-size: 13px; font-family: arial; color: #6b7b9d; border-bottom: 1px dotted;">Заказать консультацию</a></td>
  32 + <td height="25"></td><td><a class="consultation_btn" href="#" style="margin-left: 11px; font-size: 13px; font-family: arial; color: #6b7b9d; border-bottom: 1px dotted;">Заказать консультацию</a></td>
33 33 </tr>
34 34 </tbody>
35 35 </table>
... ...
frontend/views/layouts/main.php
  Show/Hide comments   View file @8575601
... ... @@ -151,7 +151,8 @@ AppAsset::register($this);
151 151  
152 152 <!-- forgot password form -->
153 153 <?= $this->render('/modal/forgot_password_form_model_window') ?>
154   -
  154 +<!-- consultation_modal -->
  155 +<?= $this->render('/modal/consultation_modal') ?>
155 156  
156 157 <!-- forgot password success message -->
157 158 <div class="forgot_pass_success_wrapper">
... ...
frontend/views/modal/call_me.php deleted
View file @550f051
1   -<div class="call_me_modal_wrapper">
2   - <!-- <form name="forgot_pass_form" id="forgot_pass_form"> -->
3   - <div class="modal_window">
4   - <form>
5   - <div class="modal_close_btn"></div>
6   - <div class="title">Перезвонить мне</div>
7   - <label>Телефон:<input type="text" name="callme_head" id="phone_num_modal" placeholder="(0xx) xxx-xx-xx"></label>
8   - <div class="for_btn_position"><button class="my_cust_btn" type="submit">перезвонить мне</button></div>
9   - </form>
10   - </div>
11   - <!-- </form> -->
12   -</div>
13 0 \ No newline at end of file
frontend/views/modal/consultation_modal.php 0 → 100755
  Show/Hide comments   View file @8575601
  1 +<?php
  2 +
  3 +use yii\helpers\Html;
  4 +
  5 +?>
  6 +<div class="consultation_modal">
  7 + <div class="modal_window">
  8 + <div class="title">Заказать консультацию</div>
  9 + <div class="modal_close_btn"></div>
  10 +
  11 + <label> Имя: <?= Html::textInput('name',"",['class'=>'consultation_name']) ?></label>
  12 +
  13 + <label> Номер телефона: <?= Html::textInput('phone',"",['class'=>'consultation_phone']) ?></label>
  14 +
  15 + <div class="for_btn_position">
  16 + <?= Html::submitButton("Заказать консультацию", ['class' => 'my_cust_btn', 'name' => 'login-button']) ?>
  17 + </div>
  18 + </div>
  19 +</div>
0 20 \ No newline at end of file
... ...
frontend/views/service/_objects.php
  Show/Hide comments   View file @8575601
... ... @@ -26,7 +26,7 @@ use yii\helpers\Url;
26 26 <tbody>
27 27 <tr>
28 28 <td height="25"><img src="/images/ico-2.jpg" alt=""></td>
29   - <td height="25"></td><td><a data-toggle="modal" href="#registrationFormModal" style="margin-left: 11px; font-size: 13px; font-family: arial; color: #6b7b9d; border-bottom: 1px dotted;">Заказать консультацию</a></td>
  29 + <td height="25"></td><td><a class="consultation_btn" style="margin-left: 11px; font-size: 13px; font-family: arial; color: #6b7b9d; border-bottom: 1px dotted;">Заказать консультацию</a></td>
30 30 </tr>
31 31 </tbody>
32 32 </table>
... ...
frontend/web/css/concat_all.css
  Show/Hide comments   View file @8575601
... ... @@ -5,9 +5,15 @@
5 5 .w_960 {
6 6 width: 960px;
7 7 margin: auto;
8   - overflow: hidden;
  8 + clear: both;
  9 + /*overflow: hidden;*/
9 10  
10 11 }
  12 +.w_960:after {
  13 + content:"";
  14 + display:table;
  15 + clear:both;
  16 +}
11 17  
12 18 .cat_p_bradcrump {
13 19 padding: 30px 0px;
... ... @@ -1945,6 +1951,122 @@ span.red {
1945 1951 padding: 8px 38px;
1946 1952 }
1947 1953  
  1954 +/* consultation window */
  1955 +
  1956 +.consultation_modal {
  1957 + color: #333333;
  1958 + width: 100%;
  1959 + background: rgba(0, 0, 0, 0.4);
  1960 + position: absolute;
  1961 + z-index: 4;
  1962 + top: 0;
  1963 + left: 0;
  1964 + display: none;
  1965 +}
  1966 +
  1967 +.consultation_modal .modal_window {
  1968 + text-align: right;
  1969 + height: 247px;
  1970 + width: 459px;
  1971 + background-color: #fff;
  1972 + padding: 20px;
  1973 + position: relative;
  1974 + margin-left:auto;
  1975 + margin-right:auto;
  1976 + margin-top: 35px;
  1977 + -webkit-border-radius: 2px;
  1978 + border-radius: 2px;
  1979 + overflow: hidden;
  1980 + z-index:999;
  1981 +}
  1982 +
  1983 +.consultation_modal .modal_window .title {
  1984 + font-size: 18px;
  1985 + font-weight: bold;
  1986 + padding-top: 29px;
  1987 + padding-bottom: 27px;
  1988 + text-transform: uppercase;
  1989 + text-align: center;
  1990 +}
  1991 +
  1992 +.consultation_modal .modal_window input {
  1993 + padding: 8px;
  1994 + width: 251px;
  1995 + margin-right: 56px;
  1996 + margin-left: 11px;
  1997 + border: 1px solid #C6C7C9;
  1998 + -webkit-border-radius: 3px;
  1999 + border-radius: 3px;
  2000 +}
  2001 +
  2002 +.consultation_modal .modal_window .my_cust_btn {
  2003 + font-size: 13px;
  2004 + padding: 8px 31px;
  2005 + color: white;
  2006 + border: none;
  2007 + -webkit-border-radius: 3px;
  2008 + border-radius: 3px;
  2009 + background-color: #6aa034;
  2010 + -webkit-box-shadow: 0 2px #517a27;
  2011 + box-shadow: 0 2px #517a27;
  2012 +}
  2013 +
  2014 +.consultation_modal .modal_window .my_cust_btn:hover {
  2015 + background-color: #5d8d2e;
  2016 +}
  2017 +
  2018 +.consultation_modal .modal_window .my_cust_btn:active {
  2019 + position: relative;
  2020 + -webkit-box-shadow: none;
  2021 + box-shadow: none;
  2022 + top: 2px;
  2023 +}
  2024 +
  2025 +.consultation_modal .modal_window .title {
  2026 + padding-right: 8px;
  2027 +}
  2028 +
  2029 +.consultation_modal .modal_window label {
  2030 + display: block;
  2031 + font-size: 13px;
  2032 + width: 459px;
  2033 + margin: auto;
  2034 + margin-bottom: 8px;
  2035 +}
  2036 +
  2037 +.consultation_modal .modal_window label input {
  2038 + margin-right: 68px;
  2039 +}
  2040 +
  2041 +.consultation_modal .modal_window .pass_links {
  2042 + text-align: center;
  2043 + padding-left: 55px;
  2044 + font-size: 13px;
  2045 + margin-top: 11px;
  2046 +}
  2047 +
  2048 +.consultation_modal .modal_window .pass_links a {
  2049 + padding-left: 47px;
  2050 +}
  2051 +
  2052 +.consultation_modal .modal_window .pass_links label {
  2053 + display: inline;
  2054 +}
  2055 +
  2056 +.consultation_modal .modal_window .pass_links .remember_pas {
  2057 + color: #6aa034;
  2058 + text-decoration: underline;
  2059 +}
  2060 +
  2061 +.consultation_modal .modal_window .for_btn_position {
  2062 + text-align: center;
  2063 + margin-top: 23px;
  2064 +}
  2065 +
  2066 +.consultation_modal .modal_window .for_btn_position .my_cust_btn {
  2067 + padding: 8px 38px;
  2068 +}
  2069 +
1948 2070 /* forgot password window */
1949 2071  
1950 2072 .forgot_pass_modal_wrapper {
... ... @@ -3161,6 +3283,14 @@ span.red {
3161 3283 color: #D75C5C;
3162 3284 }
3163 3285  
  3286 +.consultation_modal .modal_window label.error {
  3287 + margin-left: 127px;
  3288 + width: 265px;
  3289 + text-align: left;
  3290 + color: #D75C5C;
  3291 +}
  3292 +
  3293 +
3164 3294 .forgot_password_form label.error {
3165 3295 margin-left: 141px;
3166 3296 width: 265px;
... ...
frontend/web/css/concat_all_back.css
  Show/Hide comments   View file @8575601
... ... @@ -1934,6 +1934,122 @@ span.red {
1934 1934 padding: 8px 38px;
1935 1935 }
1936 1936  
  1937 +/* login window */
  1938 +
  1939 +.consultation_modal {
  1940 + color: #333333;
  1941 + width: 100%;
  1942 + background: rgba(0, 0, 0, 0.4);
  1943 + position: absolute;
  1944 + z-index: 4;
  1945 + top: 0;
  1946 + left: 0;
  1947 + display: none;
  1948 +}
  1949 +
  1950 +.consultation_modal .modal_window {
  1951 + text-align: right;
  1952 + height: 247px;
  1953 + width: 459px;
  1954 + background-color: #fff;
  1955 + padding: 20px;
  1956 + position: relative;
  1957 + margin-left:auto;
  1958 + margin-right:auto;
  1959 + margin-top: 35px;
  1960 + -webkit-border-radius: 2px;
  1961 + border-radius: 2px;
  1962 + overflow: hidden;
  1963 + z-index:999;
  1964 +}
  1965 +
  1966 +.consultation_modal .modal_window .title {
  1967 + font-size: 18px;
  1968 + font-weight: bold;
  1969 + padding-top: 29px;
  1970 + padding-bottom: 27px;
  1971 + text-transform: uppercase;
  1972 + text-align: center;
  1973 +}
  1974 +
  1975 +.consultation_modal .modal_window input {
  1976 + padding: 8px;
  1977 + width: 251px;
  1978 + margin-right: 56px;
  1979 + margin-left: 11px;
  1980 + border: 1px solid #C6C7C9;
  1981 + -webkit-border-radius: 3px;
  1982 + border-radius: 3px;
  1983 +}
  1984 +
  1985 +.consultation_modal .modal_window .my_cust_btn {
  1986 + font-size: 13px;
  1987 + padding: 8px 31px;
  1988 + color: white;
  1989 + border: none;
  1990 + -webkit-border-radius: 3px;
  1991 + border-radius: 3px;
  1992 + background-color: #6aa034;
  1993 + -webkit-box-shadow: 0 2px #517a27;
  1994 + box-shadow: 0 2px #517a27;
  1995 +}
  1996 +
  1997 +.consultation_modal .modal_window .my_cust_btn:hover {
  1998 + background-color: #5d8d2e;
  1999 +}
  2000 +
  2001 +.consultation_modal .modal_window .my_cust_btn:active {
  2002 + position: relative;
  2003 + -webkit-box-shadow: none;
  2004 + box-shadow: none;
  2005 + top: 2px;
  2006 +}
  2007 +
  2008 +.consultation_modal .modal_window .title {
  2009 + padding-right: 8px;
  2010 +}
  2011 +
  2012 +.consultation_modal .modal_window label {
  2013 + display: block;
  2014 + font-size: 13px;
  2015 + width: 459px;
  2016 + margin: auto;
  2017 + margin-bottom: 8px;
  2018 +}
  2019 +
  2020 +.consultation_modal .modal_window label input {
  2021 + margin-right: 68px;
  2022 +}
  2023 +
  2024 +.consultation_modal .modal_window .pass_links {
  2025 + text-align: center;
  2026 + padding-left: 55px;
  2027 + font-size: 13px;
  2028 + margin-top: 11px;
  2029 +}
  2030 +
  2031 +.consultation_modal .modal_window .pass_links a {
  2032 + padding-left: 47px;
  2033 +}
  2034 +
  2035 +.consultation_modal .modal_window .pass_links label {
  2036 + display: inline;
  2037 +}
  2038 +
  2039 +.consultation_modal .modal_window .pass_links .remember_pas {
  2040 + color: #6aa034;
  2041 + text-decoration: underline;
  2042 +}
  2043 +
  2044 +.consultation_modal .modal_window .for_btn_position {
  2045 + text-align: center;
  2046 + margin-top: 23px;
  2047 +}
  2048 +
  2049 +.consultation_modal .modal_window .for_btn_position .my_cust_btn {
  2050 + padding: 8px 38px;
  2051 +}
  2052 +
1937 2053 /* forgot password window */
1938 2054  
1939 2055 .forgot_pass_modal_wrapper {
... ... @@ -2965,6 +3081,13 @@ span.red {
2965 3081 color: #D75C5C;
2966 3082 }
2967 3083  
  3084 +.consultation_modal .modal_window label.error {
  3085 + margin-left: 127px;
  3086 + width: 265px;
  3087 + text-align: left;
  3088 + color: #D75C5C;
  3089 +}
  3090 +
2968 3091 .forgot_password_form label.error {
2969 3092 margin-left: 141px;
2970 3093 width: 265px;
... ...
frontend/web/css/style.css
  Show/Hide comments   View file @8575601
... ... @@ -1054,6 +1054,14 @@ input.error_pass{
1054 1054 width: 100%!important;
1055 1055 height: 100%!important;
1056 1056 }
  1057 +
  1058 +.modal_registration_form, .modal_wrapper_login, .forgot_pass_modal_wrapper, .forgot_pass_success_wrapper, .callback_wrapper, .consultation_modal{
  1059 + display: block;
  1060 + position: fixed!important;
  1061 + width: 100%!important;
  1062 + height: 100%!important;
  1063 +}
  1064 +
1057 1065 .please_phone{
1058 1066 position: absolute;
1059 1067 border: 1px solid grey;
... ...
frontend/web/js/my_scripts.js
  Show/Hide comments   View file @8575601
... ... @@ -139,6 +139,9 @@ $(document).ready(function(){
139 139 forget_pass_again_btn = $('.forgot_pass_success_wrapper').find('.my_cust_btn'),
140 140 log_open_btn = $('.login_button_lu'), // окно логина
141 141 reg_open_btn = $('.reg_button_lu'), // кнопка открыть
  142 + consultation_open_btn = $('.consultation_btn'), // кнопка консультации
  143 + consultation_btn = $('.consultation_modal button'),
  144 + consultation_modal = $('.consultation_modal'),
142 145 modal_busket_open = $('.basket_add_but, .cart_btn'), // открыть модалку корзины
143 146 modal_busket_header_open = $('i.head-down.bh_cell'), // открыть корзину в хедере
144 147 modal_busket_header = $('.busket_modal_header'), // модальная корзина хедер
... ... @@ -182,14 +185,44 @@ $(document).ready(function(){
182 185 }
183 186 else{
184 187 var num = $(".phone_me_head").find("input").val();
  188 +
185 189 var type = 'call_me';
186   - send_call_me_back( num,type, function(data){
  190 + var data = {"num":num,"type":type};
  191 + send_call_me_back( data, function(data){
187 192 callback_wrap.fadeIn(200);
188 193 $(".phone_me_head").find("input").val('');
189 194 });
190 195  
191 196 }
192 197 });
  198 +
  199 +
  200 + consultation_btn.click(function(){ // открываем окно регистрации
  201 + $(".error").removeClass("error");
  202 + $(".error_pass").removeClass("error_pass");
  203 + if($(".consultation_phone").val().length == 0){
  204 + $(".consultation_phone").addClass("error");
  205 + }
  206 + else{
  207 + var num = $(".consultation_phone").val();
  208 + var name = $(".consultation_name").val();
  209 + var type = 'consultation';
  210 + var data = {"num":num,"name":name,"type":type};
  211 + send_call_me_back( data, function(data){
  212 + consultation_modal.fadeIn(200);
  213 + $(".consultation_phone").find("input").val('');
  214 + $(".consultation_name").find("input").val('');
  215 + });
  216 +
  217 + }
  218 + });
  219 +
  220 +
  221 + consultation_open_btn.click(function(event){
  222 + event.preventDefault();
  223 + consultation_modal.toggle();
  224 +
  225 + });
193 226 modal_busket_header_cont.click(function(){ // скрываем модальную корзину в хедере по ссылке
194 227 modal_busket_header.toggle();
195 228 modal_busket_header_open.toggleClass('bh_cell_2'); // меняем класс у кнопочки вызова корзины хедера
... ... @@ -270,6 +303,7 @@ $(document).ready(function(){
270 303 forgot_pass_success_wrap.fadeOut(200);
271 304 busket_modal_wrapper.fadeOut(200);
272 305 callback_wrap.fadeOut(200);
  306 + consultation_modal.fadeOut(200);
273 307 });
274 308 $(".close_modal").click(function(){
275 309 reg_wrap.fadeOut(200);
... ... @@ -467,15 +501,11 @@ $(document).ready(function(){
467 501  
468 502 //=============================================== BUSKET MODAL WINDOW FUNCTIONS
469 503  
470   - function send_call_me_back( num, type,callback )
  504 + function send_call_me_back( data,callback )
471 505 {
472 506 $.ajax({
473 507 url: '/site/mail',
474   - data :
475   - {
476   - 'num' : num,
477   - 'type' : type
478   - },
  508 + data : data,
479 509 type : 'POST',
480 510 dataType: 'json',
481 511 success: function (data)
... ...