Merge branch 'adolfo' into auto-media-revisions

1 files changed, 26 insertions, 14 deletions

diff --git a/askbot/conf/skin_general_settings.py b/askbot/conf/skin_general_settings.py
index b90d3de5..1e488404 100644
--- a/askbot/conf/skin_general_settings.py
+++ b/askbot/conf/skin_general_settings.py
@@ -106,20 +106,7 @@ settings.register(
     )
 )
 
-settings.register(
-    values.IntegerValue(
-        GENERAL_SKIN_SETTINGS,
-        'MEDIA_RESOURCE_REVISION',
-        default = 1,
-        description = _('Skin media revision number'),
-        help_text = _(
-                    'Increment this number when you change '
-                    'image in skin media or stylesheet. '
-                    'This helps avoid showing your users '
-                    'outdated images from their browser cache.'
-                    )
-    )
-)
+
 
 settings.register(
     values.BooleanValue(
@@ -271,3 +258,28 @@ settings.register(
         )
     )
 )
+
+settings.register(
+    values.IntegerValue(
+        GENERAL_SKIN_SETTINGS,
+        'MEDIA_RESOURCE_REVISION',
+        default = 1,
+        description = _('Skin media revision number'),
+        help_text = _(
+                    'Will be set automatically'
+                    'but you can modify it if you desire.'
+                    )
+    )
+)
+
+settings.register(
+    values.StringValue(
+        GENERAL_SKIN_SETTINGS,
+        'MEDIA_RESOURCE_REVISION_HASH',
+        description = _('Hash to update the media revision number automatically.'),
+        default='',
+        help_text = _(
+            'Will be set automatically, it is not necesary to modify manually.'
+        )
+    )
+)