Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
taskonsite-архив-перенесен
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Packages
Packages
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Dmitry Korolev
taskonsite-архив-перенесен
Commits
ea381577
Commit
ea381577
authored
Mar 06, 2016
by
Виталий Мурашко
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes
parent
0d7cd6d9
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
31 additions
and
10 deletions
+31
-10
common/modules/school/assets/css/school.css
common/modules/school/assets/css/school.css
+11
-0
common/modules/school/views/lesson/view.php
common/modules/school/views/lesson/view.php
+18
-9
frontend/config/main.php
frontend/config/main.php
+1
-0
frontend/controllers/SiteController.php
frontend/controllers/SiteController.php
+1
-1
frontend/web/images/youtube_play.png
frontend/web/images/youtube_play.png
+0
-0
No files found.
common/modules/school/assets/css/school.css
View file @
ea381577
...
@@ -63,4 +63,15 @@ a.login_form_link, a.login_form_popup_link, a.reg_popup_link, a.reg_form_link {
...
@@ -63,4 +63,15 @@ a.login_form_link, a.login_form_popup_link, a.reg_popup_link, a.reg_form_link {
}
}
.button_social
{
.button_social
{
margin-top
:
-10px
;
margin-top
:
-10px
;
}
img
.play_img
{
width
:
85px
;
height
:
auto
;
top
:
50%
;
left
:
50%
;
position
:
absolute
;
cursor
:
pointer
;
}
.ytb_video
img
{
cursor
:
pointer
;
}
}
\ No newline at end of file
common/modules/school/views/lesson/view.php
View file @
ea381577
...
@@ -62,7 +62,14 @@ WidgetAssetBundle::register($this);
...
@@ -62,7 +62,14 @@ WidgetAssetBundle::register($this);
<div
class=
"col-md-12 col-xs-12 col-sm-12"
>
<div
class=
"col-md-12 col-xs-12 col-sm-12"
>
<div
class=
"ytb_video"
>
<div
class=
"ytb_video"
>
<iframe
width=
"903"
height=
"508"
src=
"https://www.youtube.com/embed/
<?php
echo
$model
->
video_id
?>
"
frameborder=
"0"
allowfullscreen
></iframe>
<?php
if
(
!
Yii
::
$app
->
user
->
isGuest
)
:
?>
<iframe
width=
"903"
height=
"508"
src=
"https://www.youtube.com/embed/
<?php
echo
$model
->
video_id
?>
"
frameborder=
"0"
allowfullscreen
></iframe>
<?php
else
:
?>
<a
href=
"#registration_form2"
class=
"popup-form"
>
<img
width=
"903"
height=
"508"
src=
"http://img.youtube.com/vi/
<?php
echo
$model
->
video_id
?>
/0.jpg"
>
<img
width=
"85"
src=
"/images/youtube_play.png"
alt=
""
class=
"play_img"
>
</a>
<?php
endif
;
?>
</div>
</div>
<?php
if
(
$model
->
course
->
spec_proposition
)
:
?>
<?php
if
(
$model
->
course
->
spec_proposition
)
:
?>
...
@@ -154,18 +161,20 @@ WidgetAssetBundle::register($this);
...
@@ -154,18 +161,20 @@ WidgetAssetBundle::register($this);
<div
class=
"row"
>
<div
class=
"row"
>
<div
class=
"col-md-6 col-xs-6 col-sm-12"
>
<div
class=
"col-md-6 col-xs-6 col-sm-12"
>
<i
class=
"ai_format"
></i>
<i
class=
"ai_format"
></i>
<a
href=
"
<?php
echo
Url
::
toRoute
([
'/school/lesson/download-documents'
,
'id'
=>
$file
->
id
]);
?>
"
class=
"ai_link"
>
<a
href=
"
<?php
echo
Yii
::
$app
->
user
->
isGuest
?
'#registration_form2'
:
Url
::
toRoute
([
'/school/lesson/download-documents'
,
'id'
=>
$file
->
id
]);
?>
"
class=
"ai_link
<?php
echo
Yii
::
$app
->
user
->
isGuest
?
'popup-form'
:
''
;
?>
"
>
<?php
echo
$file
->
title
;
?>
<?php
echo
$file
->
title
;
?>
</a>
</a>
</div>
</div>
<?php
else
:
?>
<?php
else
:
?>
<div
class=
"col-md-6 col-xs-6 col-sm-12"
>
<div
class=
"col-md-6 col-xs-6 col-sm-12"
>
<i
class=
"ai_format"
></i>
<i
class=
"ai_format"
></i>
<a
href=
"
<?php
echo
Url
::
toRoute
([
'/school/lesson/download-documents'
,
'id'
=>
$file
->
id
]);
?>
"
class=
"ai_link"
>
<a
href=
"
<?php
echo
Yii
::
$app
->
user
->
isGuest
?
'#registration_form2'
:
Url
::
toRoute
([
'/school/lesson/download-documents'
,
'id'
=>
$file
->
id
]);
?>
"
<?php
echo
$file
->
title
;
?>
class=
"ai_link
<?php
echo
Yii
::
$app
->
user
->
isGuest
?
'popup-form'
:
''
;
?>
"
>
</a>
<?php
echo
$file
->
title
;
?>
</div>
</a>
</div>
</div>
</div>
<?php
endif
;
?>
<?php
endif
;
?>
<?php
endforeach
;
?>
<?php
endforeach
;
?>
<?php
if
((
count
(
$model
->
files
)
%
2
)
!=
0
)
:
?>
<?php
if
((
count
(
$model
->
files
)
%
2
)
!=
0
)
:
?>
...
...
frontend/config/main.php
View file @
ea381577
...
@@ -182,6 +182,7 @@ return [
...
@@ -182,6 +182,7 @@ return [
'school/'
=>
'school/course/index'
,
'school/'
=>
'school/course/index'
,
'school/course/<id>/<source>'
=>
'school/course/view'
,
'school/course/<id>/<source>'
=>
'school/course/view'
,
'school/course/<id>'
=>
'school/course/view'
,
'school/course/<id>'
=>
'school/course/view'
,
'school/lesson/download-documents/<id>'
=>
'school/lesson/download-documents'
,
'school/lesson/<id>/<source>'
=>
'school/lesson/view'
,
'school/lesson/<id>/<source>'
=>
'school/lesson/view'
,
'school/lesson/<id>'
=>
'school/lesson/view'
,
'school/lesson/<id>'
=>
'school/lesson/view'
,
'login/eauth/<service_eauth:google|vk|facebook>'
=>
'site/login'
,
'login/eauth/<service_eauth:google|vk|facebook>'
=>
'site/login'
,
...
...
frontend/controllers/SiteController.php
View file @
ea381577
...
@@ -163,7 +163,7 @@ class SiteController extends Controller
...
@@ -163,7 +163,7 @@ class SiteController extends Controller
$model
=
new
LoginForm
();
$model
=
new
LoginForm
();
if
(
$model
->
load
(
Yii
::
$app
->
request
->
post
())
&&
$model
->
validate
())
if
(
$model
->
load
(
Yii
::
$app
->
request
->
post
())
&&
$model
->
validate
())
{
{
if
(
$model
->
user
->
role
==
User
::
ROLE_USER
)
if
(
$model
->
user
->
role
==
User
::
ROLE_USER
||
$model
->
user
->
role
==
User
::
ROLE_ADMIN
)
{
{
$model
->
login
();
$model
->
login
();
}
}
...
...
frontend/web/images/youtube_play.png
0 → 100644
View file @
ea381577
799 Bytes
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment