Merge branch 'master' of git@stigma:platforma

diff --combined apps/explorer/models.py
index 2b2e8e8,7e416a3..f867189
--- 1/apps/explorer/models.py
--- 2/apps/explorer/models.py
+++ b/apps/explorer/models.py
@@@ -1,6 -1,22 +1,22 @@@
  import os
  
+ from django.db import models
+ from django.contrib.auth.models import User
  from django.conf import settings
+ from django.utils.translation import gettext_lazy as _
+ 
+ 
+ class PanelSettings(models.Model):
+     user = models.ForeignKey(User)
+     left_panel = models.CharField(blank=True,  max_length=80)
+     right_panel = models.CharField(blank=True,  max_length=80)
+ 
+     class Meta:
+         ordering = ['user__name']
+         verbose_name, verbose_name_plural = _("panel settings"), _("panel settings")
+ 
+     def __unicode__(self):
+         return u"Panel settings for %s" % self.user.name
  
  
  def get_image_folders():
@@@ -12,5 -28,3 +28,5 @@@ def get_images_from_folder(folder)
              in os.listdir(os.path.join(settings.MEDIA_ROOT, settings.IMAGE_DIR, folder))
              if not fn.startswith('.'))
  
 +def user_branch(user):
 +    return 'personal_'+user.username