diff --git a/app/Resources/public/css/base.css b/app/Resources/public/css/base.css index 7378359f5b..c86400e15c 100644 --- a/app/Resources/public/css/base.css +++ b/app/Resources/public/css/base.css @@ -3621,67 +3621,6 @@ a:active{ .lt-ie7 #announcements_page { width:450px !important; } -/* Disabling chat */ -.lt-ie7 #chatmain { - display:none; -} - -#my_timeline { - margin: 0px auto; -} - -#dates { - /* height: 60px; */ - overflow: hidden; - width: 800px; -} - -#dates .selected { - font-size: 22px; - font-weight: bold; - font-color: #E06B04; -} - -#dates li { - float: left; - font-size: 14px; - height: 50px; - list-style: none outside none; - text-align: center; - width: 130px; -} - -#issues { - height: 350px; - overflow: hidden; - width: 800px; -} - -#issues li { - float: left; - height: 350px; - list-style: none outside none; - width: 800px; -} - -#issues li h3 { - color: #FFCC00; - font-size: 48px; - margin: 0px; - text-shadow: 1px 1px 2px #000000; -} - -#issues li p { - font-size: 14px; - font-weight: normal; - line-height: 22px; - margin-right: 70px; - text-shadow: 1px 1px 2px #000000; -} - -.td_actions { - width: 250px; -} /* **** FORUM CATEGORY **** */ .forum_category { @@ -6495,3 +6434,125 @@ a.sessionView { font-size: 20px; } } +#my_timeline { + width: 900px; + height: 350px; + overflow: hidden; + margin: 20px auto; + position: relative; + background: url('../../main/img/timeline/dot.gif') left 45px repeat-x; +} +#dates { + width: 800px; + height: 60px; + overflow: hidden; +} +#dates li { + list-style: none; + float: left; + width: 100px; + height: 50px; + font-size: 18px; + text-align: center; + background: url('../../main/img/timeline/biggerdot.png') center bottom no-repeat; +} +#dates a { + line-height: 38px; + padding-bottom: 10px; +} +#dates .selected { + font-size: 20px; +} +#issues { + width: 800px; + height: 350px; + overflow: hidden; +} +#issues li { + width: 800px; + height: 350px; + list-style: none; + float: left; +} +#issues li.selected img { + -webkit-transform: scale(1.1,1.1); + -moz-transform: scale(1.1,1.1); + -o-transform: scale(1.1,1.1); + -ms-transform: scale(1.1,1.1); + transform: scale(1.1,1.1); +} +#issues li img { + float: left; + margin: 10px 30px 10px 50px; + background: transparent; + -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr=#00FFFFFF,endColorstr=#00FFFFFF)"; /* IE 8 */ + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#00FFFFFF,endColorstr=#00FFFFFF);/* IE 6 & 7 */ + zoom: 1; + -webkit-transition: all 2s ease-in-out; + -moz-transition: all 2s ease-in-out; + -o-transition: all 2s ease-in-out; + -ms-transition: all 2s ease-in-out; + transition: all 2s ease-in-out; + -webkit-transform: scale(0.7,0.7); + -moz-transform: scale(0.7,0.7); + -o-transform: scale(0.7,0.7); + -ms-transform: scale(0.7,0.7); + transform: scale(0.7,0.7); +} +#issues li h1 { + color: #ffcc00; + font-size: 48px; + margin: 20px 0; + text-shadow: #000 1px 1px 2px; +} +#issues li p { + font-size: 14px; + margin-right: 70px; + font-weight: normal; + line-height: 22px; + text-shadow: #000 1px 1px 2px; +} +#grad_left, +#grad_right { + width: 100px; + height: 350px; + position: absolute; + top: 0; +} +#grad_left { + left: 0; + /* background: url('../../main/img/timeline/grad_left.png') repeat-y; */ +} +#grad_right { + right: 0; + /* background: url('../../main/img/timeline/grad_right.png') repeat-y; */ +} +#next, +#prev { + position: absolute; + top: 0; + font-size: 70px; + top: 170px; + width: 22px; + height: 38px; + background-position: 0 0; + background-repeat: no-repeat; + text-indent: -9999px; + overflow: hidden; +} +#next:hover, +#prev:hover { + background-position: 0 -76px; +} +#next { + right: 0; + background-image: url('../../main/img/timeline/next.png'); +} +#prev { + left: 0; + background-image: url('../../main/img/timeline/prev.png'); +} +#next.disabled, +#prev.disabled { + opacity: 0.2; +} \ No newline at end of file diff --git a/main/auth/my_progress.php b/main/auth/my_progress.php index 3c02405b22..561e877846 100755 --- a/main/auth/my_progress.php +++ b/main/auth/my_progress.php @@ -15,7 +15,7 @@ $nameTools = get_lang('MyProgress'); api_block_anonymous_users(); -$htmlHeadXtra[] = api_get_js('jquery.timelinr-0.9.5.js'); +$htmlHeadXtra[] = api_get_js('jquery.timelinr-0.9.54.js'); $htmlHeadXtra[] = " "; $user_id = api_get_user_id(); @@ -55,10 +56,8 @@ if (!empty($course_user_list)) { $course_image = ''; $dates .= '
  • '.api_get_utc_datetime($login).'
  • '; $issues .= '
  • -
    -
    '.$course_image.'
    -
    -
    '.sprintf( +
    '.$course_image.'
    +
    '.sprintf( get_lang('YouHaveEnteredTheCourseXInY'), $courseInfo['code'], api_convert_and_format_date($login, DATE_FORMAT_LONG) @@ -75,20 +74,19 @@ if (!empty($dates)) { if (!empty($content)) { $content .= ''; } - $content .= '
    '.Display::page_subheader(get_lang('Timeline')); - $content .= '
    '; - $actionsLeft = ''; - $actionsRight = ''; - $content .= Display::toolbarAction('toolbar-linetime',array(0 => $actionsLeft, 1 => $actionsRight), 2, true); + $content .= Display::page_subheader(get_lang('Timeline')); + $content .= '
    '; + $content .= '
    '; + $content .= '
    '; + $content .= '
      ' . $dates . '
    '; + $content .= '
      ' . $issues . '
    '; + $content .= '
    '; + $content .= '
    '; + $content .= ''; + $content .= ''; + $content .= '
    '; - $content .= '
      - '.$dates.' -
    -
      - '.$issues.' -
    -
    '; } $message = null; diff --git a/main/img/blankquestion.gif b/main/img/blankquestion.gif deleted file mode 100755 index f1c9bb33a7..0000000000 Binary files a/main/img/blankquestion.gif and /dev/null differ diff --git a/main/img/bluelogo.gif b/main/img/bluelogo.gif deleted file mode 100755 index 2575ca948e..0000000000 Binary files a/main/img/bluelogo.gif and /dev/null differ diff --git a/main/img/help_course_authoring.png b/main/img/help_course_authoring.png deleted file mode 100755 index 2a34f84c32..0000000000 Binary files a/main/img/help_course_authoring.png and /dev/null differ diff --git a/main/img/hotspot_delineation.gif b/main/img/hotspot_delineation.gif deleted file mode 100755 index 45524e35bb..0000000000 Binary files a/main/img/hotspot_delineation.gif and /dev/null differ diff --git a/main/img/mr_dokeos.png b/main/img/mr_dokeos.png deleted file mode 100755 index 4fce29a475..0000000000 Binary files a/main/img/mr_dokeos.png and /dev/null differ diff --git a/main/img/postit.png b/main/img/postit.png deleted file mode 100755 index 17c4b2caf3..0000000000 Binary files a/main/img/postit.png and /dev/null differ diff --git a/main/img/postit_bottom.jpg b/main/img/postit_bottom.jpg deleted file mode 100755 index fc04517959..0000000000 Binary files a/main/img/postit_bottom.jpg and /dev/null differ diff --git a/main/img/postit_bottom.png b/main/img/postit_bottom.png deleted file mode 100755 index 3e930f0010..0000000000 Binary files a/main/img/postit_bottom.png and /dev/null differ diff --git a/main/img/postit_center.jpg b/main/img/postit_center.jpg deleted file mode 100755 index 98cd09b31e..0000000000 Binary files a/main/img/postit_center.jpg and /dev/null differ diff --git a/main/img/postit_center.png b/main/img/postit_center.png deleted file mode 100755 index 6e6e46b3ce..0000000000 Binary files a/main/img/postit_center.png and /dev/null differ diff --git a/main/img/postit_top.jpg b/main/img/postit_top.jpg deleted file mode 100755 index 4805aa40f2..0000000000 Binary files a/main/img/postit_top.jpg and /dev/null differ diff --git a/main/img/postit_top.png b/main/img/postit_top.png deleted file mode 100755 index a5ad8e4730..0000000000 Binary files a/main/img/postit_top.png and /dev/null differ