Commit 9cc0b7e44e220cfcb73459d4412531e79243c3b9
1 parent
6f63eee1
tokar commit
Showing
4 changed files
with
83 additions
and
6 deletions
Show diff stats
frontend/views/accounts/_portfolio_form.php
@@ -100,7 +100,7 @@ | @@ -100,7 +100,7 @@ | ||
100 | </div> | 100 | </div> |
101 | 101 | ||
102 | <div class="input-blocks-wrapper"> | 102 | <div class="input-blocks-wrapper"> |
103 | - <div class="input-blocks admin-project-list admin-currency-second"> | 103 | + <div class="input-blocks admin-project-list admin-currency-second admin-portfolio-select"> |
104 | <?= $form->field($portfolio, 'gallery_id') | 104 | <?= $form->field($portfolio, 'gallery_id') |
105 | ->hint("<p>Для создания галереи перейдите по " . Html::a('ссылке', [ 'accounts/gallery-create' ], [ 'target' => '_BLANK' ]) . "</p>") | 105 | ->hint("<p>Для создания галереи перейдите по " . Html::a('ссылке', [ 'accounts/gallery-create' ], [ 'target' => '_BLANK' ]) . "</p>") |
106 | ->dropDownList($galleries, [ 'prompt' => 'Выберите галерею' ]) ?> | 106 | ->dropDownList($galleries, [ 'prompt' => 'Выберите галерею' ]) ?> |
@@ -189,7 +189,17 @@ | @@ -189,7 +189,17 @@ | ||
189 | $(document).ready( | 189 | $(document).ready( |
190 | function() | 190 | function() |
191 | { | 191 | { |
192 | + bottomButton() | ||
193 | + function bottomButton(){ | ||
194 | + if( ($('.admin-portfolio-foto .admin-avatar-pattern img').length)>0 ) { | ||
192 | 195 | ||
196 | + } else { | ||
197 | + $('.admin-portfolio-foto .tst').css({marginBottom:0}) | ||
198 | + } | ||
199 | + } | ||
200 | + $('body').on('click', '.admin-portfolio-foto #cover_remove_img',function(){ | ||
201 | + bottomButton() | ||
202 | + }) | ||
193 | } | 203 | } |
194 | ) | 204 | ) |
195 | </script> | 205 | </script> |
frontend/views/layouts/admin.php
@@ -26,6 +26,7 @@ $this->beginContent('@app/views/layouts/main.php'); | @@ -26,6 +26,7 @@ $this->beginContent('@app/views/layouts/main.php'); | ||
26 | [ | 26 | [ |
27 | 'label' => 'Учетные данные', | 27 | 'label' => 'Учетные данные', |
28 | 'url' => ['accounts/general'], | 28 | 'url' => ['accounts/general'], |
29 | + 'options' => ['class' => 'admin-menu-icons admin-menu-ico-1',], | ||
29 | ], | 30 | ], |
30 | [ | 31 | [ |
31 | 'label' => 'Контакты', | 32 | 'label' => 'Контакты', |
@@ -87,6 +88,7 @@ $this->beginContent('@app/views/layouts/main.php'); | @@ -87,6 +88,7 @@ $this->beginContent('@app/views/layouts/main.php'); | ||
87 | [ | 88 | [ |
88 | 'label' => 'Сообщения', | 89 | 'label' => 'Сообщения', |
89 | 'url' => ['chat/list'], | 90 | 'url' => ['chat/list'], |
91 | + 'options' => ['class' => 'admin-menu-icons admin-menu-ico-2',], | ||
90 | ], | 92 | ], |
91 | [ | 93 | [ |
92 | 'label' => 'Уведомления о проектах', | 94 | 'label' => 'Уведомления о проектах', |
@@ -95,10 +97,12 @@ $this->beginContent('@app/views/layouts/main.php'); | @@ -95,10 +97,12 @@ $this->beginContent('@app/views/layouts/main.php'); | ||
95 | [ | 97 | [ |
96 | 'label' => 'Закладки', | 98 | 'label' => 'Закладки', |
97 | 'url' => ['accounts/bookmarks'], | 99 | 'url' => ['accounts/bookmarks'], |
100 | + 'options' => ['class' => 'admin-menu-icons admin-menu-ico-3',], | ||
98 | ], | 101 | ], |
99 | [ | 102 | [ |
100 | 'label' => 'Настройка аккаунта', | 103 | 'label' => 'Настройка аккаунта', |
101 | 'url' => ['accounts/setting'], | 104 | 'url' => ['accounts/setting'], |
105 | + 'options' => ['class' => 'admin-menu-icons admin-menu-ico-4',], | ||
102 | ], | 106 | ], |
103 | [ | 107 | [ |
104 | 'label' => 'Выход', | 108 | 'label' => 'Выход', |
frontend/views/layouts/main.php
@@ -154,15 +154,15 @@ AppAsset::register($this); | @@ -154,15 +154,15 @@ AppAsset::register($this); | ||
154 | 'items' => [ | 154 | 'items' => [ |
155 | [ | 155 | [ |
156 | 'url' => ['/projects'], | 156 | 'url' => ['/projects'], |
157 | - 'template' => '<a href="{url}" class="main-menu-icons-home"></a>', | 157 | + 'template' => '<a href="{url}" class="main-menu-icons-home"><span>99+</span></a>', |
158 | ], | 158 | ], |
159 | [ | 159 | [ |
160 | 'url' => ['chat/list'], | 160 | 'url' => ['chat/list'], |
161 | - 'template' => '<a href="{url}" class="main-menu-icons-edit"></a>', | 161 | + 'template' => '<a href="{url}" class="main-menu-icons-edit"><span>28</span></a>', |
162 | ], | 162 | ], |
163 | [ | 163 | [ |
164 | 'url' => ['accounts/bookmarks'], | 164 | 'url' => ['accounts/bookmarks'], |
165 | - 'template' => '<a href="{url}" class="main-menu-icons-copy"></a>', | 165 | + 'template' => '<a href="{url}" class="main-menu-icons-copy"><span>1</span></a>', |
166 | ], | 166 | ], |
167 | ], | 167 | ], |
168 | ]); | 168 | ]); |
frontend/web/css/style.css
@@ -3304,6 +3304,26 @@ ul.proektant-comments {margin-top: 15px} | @@ -3304,6 +3304,26 @@ ul.proektant-comments {margin-top: 15px} | ||
3304 | float: left; | 3304 | float: left; |
3305 | margin-left: 20px; | 3305 | margin-left: 20px; |
3306 | margin-top: 9px; | 3306 | margin-top: 9px; |
3307 | + position: relative; | ||
3308 | +} | ||
3309 | +.main-menu-icons-wr a span { | ||
3310 | + position: absolute; | ||
3311 | + width: 18px; | ||
3312 | + height: 18px; | ||
3313 | + background: #ea5151; | ||
3314 | + border-radius: 100%; | ||
3315 | + top: -6px; | ||
3316 | + right: -18px; | ||
3317 | + line-height: 18px; | ||
3318 | + text-align: center; | ||
3319 | + font-size: 9px; | ||
3320 | + color: #fff; | ||
3321 | +} | ||
3322 | +.main-menu-icons-home span { | ||
3323 | + right: -15px !important; | ||
3324 | +} | ||
3325 | +.main-menu-icons-copy span { | ||
3326 | + right: -20px !important; | ||
3307 | } | 3327 | } |
3308 | .main-menu-icons-wr a:first-child{margin-left: 0} | 3328 | .main-menu-icons-wr a:first-child{margin-left: 0} |
3309 | .main-menu-icons-home { | 3329 | .main-menu-icons-home { |
@@ -5931,7 +5951,9 @@ a {color: #0072bc} | @@ -5931,7 +5951,9 @@ a {color: #0072bc} | ||
5931 | font-size: 13px; | 5951 | font-size: 13px; |
5932 | color: #0072bc; | 5952 | color: #0072bc; |
5933 | border-bottom: 1px dashed #0072bc; | 5953 | border-bottom: 1px dashed #0072bc; |
5954 | + cursor: pointer; | ||
5934 | } | 5955 | } |
5956 | +.admin-hint-vacancy-contact:active {color: #00558C} | ||
5935 | .input-blocks-wrapper.admn-select-company select{ | 5957 | .input-blocks-wrapper.admn-select-company select{ |
5936 | line-height: normal; | 5958 | line-height: normal; |
5937 | padding: 0 0 0 8px; | 5959 | padding: 0 0 0 8px; |
@@ -6249,8 +6271,8 @@ input[disabled], select[disabled] { | @@ -6249,8 +6271,8 @@ input[disabled], select[disabled] { | ||
6249 | } | 6271 | } |
6250 | .admin-page .third-ul-menu li a{cursor: default} | 6272 | .admin-page .third-ul-menu li a{cursor: default} |
6251 | .admin-menu-list {margin-top: 37px} | 6273 | .admin-menu-list {margin-top: 37px} |
6252 | -.admin-portfolio-foto .tst{background: none; height: auto} | ||
6253 | -.admin-portfolio-foto.success_download .tst {height: 150px} | 6274 | +.admin-portfolio-foto .tst{background: none; height: auto; margin-bottom: 15px} |
6275 | +.admin-portfolio-foto.success_download .tst {height: 150px; margin-bottom: 0} | ||
6254 | .admin-portfolio-foto .admin-ava-wr img{width: 210px !important; height: 150px !important;} | 6276 | .admin-portfolio-foto .admin-ava-wr img{width: 210px !important; height: 150px !important;} |
6255 | .admin-portfolio-foto .file-uploader-block{width: 210px} | 6277 | .admin-portfolio-foto .file-uploader-block{width: 210px} |
6256 | .admin-portfolio-foto .admin-avatar-pattern {height: auto; width: 210px} | 6278 | .admin-portfolio-foto .admin-avatar-pattern {height: auto; width: 210px} |
@@ -6267,4 +6289,45 @@ input[disabled], select[disabled] { | @@ -6267,4 +6289,45 @@ input[disabled], select[disabled] { | ||
6267 | display: block; | 6289 | display: block; |
6268 | text-align: left; | 6290 | text-align: left; |
6269 | height: auto; | 6291 | height: auto; |
6292 | +} | ||
6293 | +.admin-portfolio-select select{ | ||
6294 | + margin-top: 5px !important; | ||
6295 | + | ||
6296 | +} | ||
6297 | +.input-blocks.admin-portfolio-select { | ||
6298 | + position: relative; | ||
6299 | +} | ||
6300 | +.admin-portfolio-select .hint-block { | ||
6301 | + position: absolute; | ||
6302 | + top: 29px; | ||
6303 | + left: 310px; | ||
6304 | + width: 400px; | ||
6305 | +} | ||
6306 | +.admin-portfolio-select .hint-block p, .admin-portfolio-select .hint-block a { | ||
6307 | + font-size: 13px; | ||
6308 | +} | ||
6309 | +.admin-portfolio-select .hint-block p { | ||
6310 | + color: #b7b7b7; | ||
6311 | +} | ||
6312 | +.admin-menu-icons a:before { | ||
6313 | + position: absolute; | ||
6314 | + top: 50%; | ||
6315 | + margin-top: -8px; | ||
6316 | + right: 10px; | ||
6317 | + width: 16px; | ||
6318 | + height: 16px; | ||
6319 | + content: ''; | ||
6320 | + background: red; | ||
6321 | +} | ||
6322 | +.admin-menu-ico-1 a:before { | ||
6323 | + background: url("/images/menu-ico/ico-1.png") 100% 50% no-repeat ; | ||
6324 | +} | ||
6325 | +.admin-menu-ico-2 a:before { | ||
6326 | + background: url("/images/menu-ico/ico-2.png") 100% 50% no-repeat ; | ||
6327 | +} | ||
6328 | +.admin-menu-ico-3 a:before { | ||
6329 | + background: url("/images/menu-ico/ico-3.png") 100% 50% no-repeat ; | ||
6330 | +} | ||
6331 | +.admin-menu-ico-4 a:before { | ||
6332 | + background: url("/images/menu-ico/ico-4.png") 100% 50% no-repeat ; | ||
6270 | } | 6333 | } |
6271 | \ No newline at end of file | 6334 | \ No newline at end of file |