Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
d0cfa6bb
Commit
d0cfa6bb
authored
Oct 08, 2014
by
Omar Al-Ithawi
Committed by
Zia Fazal
Apr 07, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Elegant rtl/ltr css switch, LMS RTL fixes, language aware @cache_if_anonymous
parent
25cb5ad6
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
42 additions
and
19 deletions
+42
-19
.gitignore
+6
-0
cms/static/sass/style-xmodule.scss
+2
-0
common/djangoapps/pipeline_mako/templates/static_content.html
+8
-0
common/djangoapps/util/cache.py
+3
-1
lms/static/sass/course/layout/_courseware_header.scss
+1
-1
lms/static/sass/discussion/_discussion.scss
+1
-1
lms/static/sass/multicourse/_dashboard.scss
+2
-2
lms/static/sass/shared/_header.scss
+19
-14
No files found.
.gitignore
View file @
d0cfa6bb
...
@@ -71,13 +71,19 @@ lms/static/css/
...
@@ -71,13 +71,19 @@ lms/static/css/
lms/static/sass/*.css
lms/static/sass/*.css
lms/static/sass/*.css.map
lms/static/sass/*.css.map
lms/static/sass/application.scss
lms/static/sass/application.scss
lms/static/sass/application-rtl.scss
lms/static/sass/application-extend1.scss
lms/static/sass/application-extend1.scss
lms/static/sass/application-extend1-rtl.scss
lms/static/sass/application-extend2.scss
lms/static/sass/application-extend2.scss
lms/static/sass/application-extend2-rtl.scss
lms/static/sass/course.scss
lms/static/sass/course.scss
lms/static/sass/course-rtl.scss
cms/static/css/
cms/static/css/
cms/static/sass/*.css
cms/static/sass/*.css
cms/static/sass/*.css.map
cms/static/sass/*.css.map
### Logging artifacts
### Logging artifacts
log/
log/
logs
logs
...
...
cms/static/sass/style-xmodule.scss
View file @
d0cfa6bb
// studio - xmodule architecture
// studio - xmodule architecture
// ====================
// ====================
@import
'vendor/bi-app/bi-app-ltr'
;
// set the layout for right to left languages
// libs and resets *do not edit*
// libs and resets *do not edit*
@import
'bourbon/bourbon'
;
// lib - bourbon
@import
'bourbon/bourbon'
;
// lib - bourbon
...
...
common/djangoapps/pipeline_mako/templates/static_content.html
View file @
d0cfa6bb
<
%!
<
%!
from
staticfiles
.
storage
import
staticfiles_storage
from
staticfiles
.
storage
import
staticfiles_storage
from
pipeline_mako
import
compressed_css
,
compressed_js
from
pipeline_mako
import
compressed_css
,
compressed_js
from
django
.
utils
.
translation
import
get_language_bidi
%
>
%
>
<
%
def
name=
'url(file, raw=False)'
><
%
<
%
def
name=
'url(file, raw=False)'
><
%
...
@@ -11,6 +12,13 @@ except:
...
@@ -11,6 +12,13 @@ except:
%
>
${url}${"?raw" if raw else ""}
</
%
def>
%
>
${url}${"?raw" if raw else ""}
</
%
def>
<
%
def
name=
'css(group, raw=False)'
>
<
%
def
name=
'css(group, raw=False)'
>
<
%
rtl_group =
'{}-rtl'
.
format
(
group
)
if
get_language_bidi
()
and
rtl_group
in
settings
.
PIPELINE_CSS:
group =
rtl_group
%
>
% if settings.FEATURES['USE_DJANGO_PIPELINE']:
% if settings.FEATURES['USE_DJANGO_PIPELINE']:
${compressed_css(group, raw=raw)}
${compressed_css(group, raw=raw)}
% else:
% else:
...
...
common/djangoapps/util/cache.py
View file @
d0cfa6bb
...
@@ -12,6 +12,8 @@ from django.core import cache
...
@@ -12,6 +12,8 @@ from django.core import cache
# If we can't find a 'general' CACHE defined in settings.py, we simply fall back
# If we can't find a 'general' CACHE defined in settings.py, we simply fall back
# to returning the default cache. This will happen with dev machines.
# to returning the default cache. This will happen with dev machines.
from
django.utils.translation
import
get_language
try
:
try
:
cache
=
cache
.
get_cache
(
'general'
)
cache
=
cache
.
get_cache
(
'general'
)
except
Exception
:
except
Exception
:
...
@@ -45,7 +47,7 @@ def cache_if_anonymous(view_func):
...
@@ -45,7 +47,7 @@ def cache_if_anonymous(view_func):
# same view accessed through different domain names may
# same view accessed through different domain names may
# return different things, so include the domain name in the key.
# return different things, so include the domain name in the key.
domain
=
str
(
request
.
META
.
get
(
'HTTP_HOST'
))
+
'.'
domain
=
str
(
request
.
META
.
get
(
'HTTP_HOST'
))
+
'.'
cache_key
=
domain
+
"cache_if_anonymous."
+
request
.
path
cache_key
=
domain
+
"cache_if_anonymous."
+
get_language
()
+
'.'
+
request
.
path
response
=
cache
.
get
(
cache_key
)
response
=
cache
.
get
(
cache_key
)
if
not
response
:
if
not
response
:
response
=
view_func
(
request
,
*
args
,
**
kwargs
)
response
=
view_func
(
request
,
*
args
,
**
kwargs
)
...
...
lms/static/sass/course/layout/_courseware_header.scss
View file @
d0cfa6bb
...
@@ -16,7 +16,7 @@ nav.course-material {
...
@@ -16,7 +16,7 @@ nav.course-material {
@include
border-top-radius
(
4px
);
@include
border-top-radius
(
4px
);
@include
clearfix
;
@include
clearfix
;
padding
:
28px
0
10px
0
;
padding
:
28px
0
10px
0
;
margin-left
:
10px
;
@include
margin-left
(
10px
)
;
li
{
li
{
float
:
$left
;
float
:
$left
;
...
...
lms/static/sass/discussion/_discussion.scss
View file @
d0cfa6bb
...
@@ -30,7 +30,7 @@ body.discussion, .discussion-course, div.discussion-body {
...
@@ -30,7 +30,7 @@ body.discussion, .discussion-course, div.discussion-body {
.new-post-btn
{
.new-post-btn
{
@include
blue-button
;
@include
blue-button
;
margin-right
:
4px
;
@include
margin-right
(
4px
)
;
}
}
.new-post-icon
{
.new-post-icon
{
...
...
lms/static/sass/multicourse/_dashboard.scss
View file @
d0cfa6bb
...
@@ -889,7 +889,7 @@
...
@@ -889,7 +889,7 @@
}
}
a
.unenroll
{
a
.unenroll
{
float
:
right
;
@include
float
(
right
)
;
display
:
block
;
display
:
block
;
font-style
:
italic
;
font-style
:
italic
;
color
:
$lighter-base-font-color
;
color
:
$lighter-base-font-color
;
...
@@ -904,7 +904,7 @@
...
@@ -904,7 +904,7 @@
a
.email-settings
{
a
.email-settings
{
@extend
a
.unenroll
;
@extend
a
.unenroll
;
margin-right
:
10px
;
@include
margin-right
(
10px
)
;
}
}
}
}
...
...
lms/static/sass/shared/_header.scss
View file @
d0cfa6bb
...
@@ -109,7 +109,7 @@ header.global {
...
@@ -109,7 +109,7 @@ header.global {
>
.primary
{
>
.primary
{
display
:
block
;
display
:
block
;
float
:
left
;
@include
float
(
left
)
;
margin
:
0px
;
margin
:
0px
;
position
:
relative
;
position
:
relative
;
...
@@ -120,14 +120,14 @@ header.global {
...
@@ -120,14 +120,14 @@ header.global {
&
:last-child
{
&
:last-child
{
>
a
{
>
a
{
border-radius
:
0
4px
4px
0
;
@include
border-radius
(
0
,
4px
,
4px
,
0
)
;
border-left
:
none
;
@include
border-left
(
none
)
;
padding
:
5px
8px
7px
8px
;
padding
:
5px
8px
7px
8px
;
&
.shopping-cart
{
&
.shopping-cart
{
border-radius
:
4px
;
border-radius
:
4px
;
border
:
1px
solid
$border-color-2
;
border
:
1px
solid
$border-color-2
;
margin-right
:
10px
;
@include
margin-right
(
10px
)
;
padding-bottom
:
6px
;
padding-bottom
:
6px
;
}
}
}
}
...
@@ -135,7 +135,7 @@ header.global {
...
@@ -135,7 +135,7 @@ header.global {
}
}
a
.user-link
{
a
.user-link
{
padding
:
6px
12px
8px
35px
;
@include
padding
(
6px
,
12px
,
8px
,
35px
)
;
position
:
relative
;
position
:
relative
;
text-transform
:
none
;
text-transform
:
none
;
font-size
:
14px
;
font-size
:
14px
;
...
@@ -145,9 +145,14 @@ header.global {
...
@@ -145,9 +145,14 @@ header.global {
.avatar
{
.avatar
{
@include
background-image
(
url('../images/small-header-home-icon.png')
);
@include
background-image
(
url('../images/small-header-home-icon.png')
);
background-repeat
:
no-repeat
;
background-repeat
:
no-repeat
;
@include
rtl
{
background-position
:
top
right
;
}
height
:
26px
;
height
:
26px
;
display
:
inline-block
;
display
:
inline-block
;
left
:
8px
;
@include
left
(
8px
)
;
opacity
:
0
.5
;
opacity
:
0
.5
;
overflow
:
hidden
;
overflow
:
hidden
;
position
:
absolute
;
position
:
absolute
;
...
@@ -171,7 +176,7 @@ header.global {
...
@@ -171,7 +176,7 @@ header.global {
display
:
none
;
display
:
none
;
padding
:
5px
10px
;
padding
:
5px
10px
;
position
:
absolute
;
position
:
absolute
;
right
:
0px
;
@include
right
(
0px
)
;
top
:
34px
;
top
:
34px
;
width
:
170px
;
width
:
170px
;
z-index
:
3
;
z-index
:
3
;
...
@@ -394,7 +399,7 @@ header.global-new {
...
@@ -394,7 +399,7 @@ header.global-new {
}
}
.primary
{
.primary
{
margin-right
:
5px
;
@include
margin-right
(
5px
)
;
>
a
{
>
a
{
@include
background-image
(
$button-bg-image
);
@include
background-image
(
$button-bg-image
);
...
@@ -415,7 +420,7 @@ header.global-new {
...
@@ -415,7 +420,7 @@ header.global-new {
vertical-align
:
middle
;
vertical-align
:
middle
;
&
:last-child
{
&
:last-child
{
margin-right
:
0px
;
@include
margin-right
(
0px
)
;
}
}
&
:hover
,
&
:focus
,
&
:active
{
&
:hover
,
&
:focus
,
&
:active
{
...
@@ -430,7 +435,7 @@ header.global-new {
...
@@ -430,7 +435,7 @@ header.global-new {
>
.primary
{
>
.primary
{
display
:
block
;
display
:
block
;
float
:
left
;
@include
float
(
left
)
;
margin
:
0px
;
margin
:
0px
;
position
:
relative
;
position
:
relative
;
...
@@ -456,7 +461,7 @@ header.global-new {
...
@@ -456,7 +461,7 @@ header.global-new {
}
}
a
.user-link
{
a
.user-link
{
padding
:
6px
12px
8px
35px
;
@include
padding
(
6px
,
12px
,
8px
,
35px
)
;
position
:
relative
;
position
:
relative
;
text-transform
:
none
;
text-transform
:
none
;
font-size
:
14px
;
font-size
:
14px
;
...
@@ -468,7 +473,7 @@ header.global-new {
...
@@ -468,7 +473,7 @@ header.global-new {
background-repeat
:
no-repeat
;
background-repeat
:
no-repeat
;
height
:
26px
;
height
:
26px
;
display
:
inline-block
;
display
:
inline-block
;
left
:
8px
;
@include
left
(
8px
)
;
opacity
:
0
.5
;
opacity
:
0
.5
;
overflow
:
hidden
;
overflow
:
hidden
;
position
:
absolute
;
position
:
absolute
;
...
@@ -492,7 +497,7 @@ header.global-new {
...
@@ -492,7 +497,7 @@ header.global-new {
display
:
none
;
display
:
none
;
padding
:
5px
10px
;
padding
:
5px
10px
;
position
:
absolute
;
position
:
absolute
;
right
:
0px
;
@include
right
(
0px
)
;
top
:
34px
;
top
:
34px
;
width
:
170px
;
width
:
170px
;
z-index
:
3
;
z-index
:
3
;
...
@@ -515,7 +520,7 @@ header.global-new {
...
@@ -515,7 +520,7 @@ header.global-new {
height
:
0px
;
height
:
0px
;
position
:
absolute
;
position
:
absolute
;
@include
transform
(
rotate
(
-45deg
));
@include
transform
(
rotate
(
-45deg
));
right
:
12px
;
@include
right
(
12px
)
;
top
:
-6px
;
top
:
-6px
;
width
:
0px
;
width
:
0px
;
}
}
...
...
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