matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'hotfix/0.10-hotfix2' into development

Browse Source 
Conflicts:
	apps/main/__init__.py
This commit is contained in:
Roberto Rosario
2011-12-05 15:17:56 -04:00
parent 623fa8276f dd34b9b6dd
commit 5ec7898c55
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/main/__init__.py
View File

@@ -19,9 +19,9 @@ __status__ = 'Production'
__version_info__ = {
'major': 0,
'minor': 10,
'micro': 1,
'releaselevel': 'final',
'serial': 0
'micro': 0,
'releaselevel': 'hotfix',
'serial': 2
}
def is_superuser(context):

2
apps/web_theme/templates/web_theme_base.html
View File

@@ -15,7 +15,7 @@
{% compress css %}
<link rel="stylesheet" href="{{ STATIC_URL }}web_theme_media/stylesheets/base.css" type="text/css" media="screen" />
<link rel="stylesheet" id="current-theme" href="{{ STATIC_URL }}web_theme_media/stylesheets/themes/{{ web_theme }}/style.css" type="text/css" media="screen" />
<link rel="stylesheet" id="current-theme" href="{{ STATIC_URL }}web_theme_media/stylesheets/themes/{{ web_theme|default:'activo' }}/style.css" type="text/css" media="screen" />
<style type="text/css">
.message span.dismiss {
padding:0 5px;