Merge branch 'develop' of 86.50.143.68:vtmk/web2.0 into develop

infoscreen/migrations/0007_sossoinfoitem.py

@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9 on 2016-09-27 18:06
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('infoscreen', '0006_abbinfoitem_externalimageinfoitem_imageinfoitem_infoinstance_infoitem'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='SossoInfoItem',
+            fields=[
+                ('infoitem_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='infoscreen.InfoItem')),
+            ],
+            bases=('infoscreen.infoitem',),
+        ),
+    ]

infoscreen/models.py

@@ -72,6 +72,13 @@ class ABBInfoItem(InfoItem):
     def get_create_template_url():
         return "/static/html/abb_create.html"
 
+class SossoInfoItem(InfoItem):
+    def get_template_url(self):
+        return "/static/html/sosso.html"
+    @staticmethod
+    def get_create_template_url():
+        return "/static/html/sosso_create.html"
+
 class ImageInfoItem(InfoItem):
     img = models.ImageField(upload_to="infoimages/")
 

infoscreen/static/html/sosso.html

@@ -0,0 +1,19 @@
+<div ng-controller="SossoController">
+    <div class="row" style="max-height:300px">
+        <div class="col-xs-4 col-xs-offset-1" style="padding-top:30px;padding-bottom:30px"><img src=""></div>
+        <div class="col-xs-7" style="font-size:100px;padding-top:30px">JUTUT</div>
+    </div>
+
+    <div class="row" ng-repeat="post in data.posts" style="height:150px;border:2px solid black;color:#33333">
+    	<div class="row" style="max-height:100px">
+        	<div class="col-xs-1 col-xs-offset-2"><img ng-src="{{ post.thumbnail }}" style="height:150px;"></div>
+        	<div class="col-xs-8 col-xs-offset-1"> 
+                <h1 style="font-size:48px">{{ post.title }}</h1>
+                <div class="row">
+                    <div class="col-xs-offset-6" style="font-size:12px">{{ post.author.first_name }} {{ post.author.last_name }}</div>
+                    <div class="col-xs-offset-6" style="font-size:12px">{{ post.date }}</div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>

infoscreen/static/html/sosso_create.html

@@ -0,0 +1,7 @@
+<div ng-controller="infoadmin_sossoitem_create" style="margin-top:20px;">
+    <div class="form-group">
+        <label>Name:</label>
+        <input type="text" ng-model="item.name"></input>
+    </div>
+    <input type="button" class="btn btn-success" ng-click="send()" value="create"></input>
+</div>

infoscreen/static/js/infoadmin_controllers.js

@@ -106,6 +106,12 @@ app.controller('infoadmin_abbitem_create', function($scope, $http,ItemList){
         $http.post("/infoscreen/create_abbitem", $scope.item).then(ItemList.loadItems)
     }
 });
+app.controller('infoadmin_sossoitem_create', function($scope, $http,ItemList){
+    $scope.item = {}
+    $scope.send = function(){
+        $http.post("/infoscreen/create_sossoitem", $scope.item).then(ItemList.loadItems)
+    }
+});
 
 app.controller('infoadmin_image_create', ['$scope', 'Upload', '$timeout',"ItemList", function ($scope, Upload, $timeout,ItemList) {
     $scope.send = function(file) {

infoscreen/static/js/infoscreen_controllers.js

@@ -39,6 +39,13 @@ app.controller('ABBController', function($scope, $http){
         $scope.jobs = response.data;
     })
 });
+app.controller('SossoController', function($scope, $http){
+    $scope.data = [];
+    $http.get("http://sosso.fi/api/get_recent_posts/?count=" + 3 ).then(function(response)
+    {
+        $scope.data = response.data;
+    })
+});
 app.controller('timetableCtrl',
 	function($scope, $http, $interval) {
 		function load(){

infoscreen/views.py

@@ -7,7 +7,7 @@ from django.contrib.auth.decorators import permission_required
 from django.utils import timezone
 
 from infoscreen.models import ABBJob, Rotation, InfoItem, InfoInstance
-from infoscreen.models import ABBInfoItem, ExternalImageInfoItem, ImageInfoItem
+from infoscreen.models import ABBInfoItem, ExternalImageInfoItem, ImageInfoItem, SossoInfoItem
 from infoscreen.models import ImageUploadForm
 
 from datetime import datetime, timedelta
@@ -146,4 +146,5 @@ def createImageItem(request, *args, **kwargs):
 createInstance = itemCreator(InfoInstance)
 deleteInstance = itemDeletor(InfoInstance)
 createABBItem = itemCreator(ABBInfoItem)
+createSossoItem = itemCreator(SossoInfoItem)
 createExternalImageInfoItem = itemCreator(ExternalImageInfoItem)

sikweb/urls.py

@@ -43,6 +43,7 @@ from infoscreen.views import deleteInstance as deleteInfoInstance
 from infoscreen.views import createExternalImageInfoItem
 from infoscreen.views import createImageItem
 from infoscreen.views import createABBItem
+from infoscreen.views import createSossoItem
 from infoscreen.views import admin as infoscreen_admin
 #application
 from members.views import applicationindex
@@ -78,6 +79,7 @@ urlpatterns = [
     url(r'^infoscreen/create_external_image$', createExternalImageInfoItem),
     url(r'^infoscreen/create_image$', createImageItem),
     url(r'^infoscreen/create_abbitem$', createABBItem),
+    url(r'^infoscreen/create_sossoitem$', createSossoItem),
     url(r'^infoscreen/admin$', infoscreen_admin),
     #application
     url(r'^application/$', applicationindex),