Removed static news. Added to site. Fixed lists by CSS. Fixed admin f…

…ields.
andreyshipilov · Feb 4, 2013 · 77cffcb · 77cffcb
1 parent dbac4f4
commit 77cffcb
Show file tree

Hide file tree

Showing 32 changed files with 30 additions and 4 deletions.
diff --git a/macdac/apps/news/admin.py b/macdac/apps/news/admin.py
@@ -33,9 +33,15 @@ class ElementAdmin(admin.ModelAdmin):
     inlines = (ElementImageInline,)
 
     fieldsets = [
-	(None, {'fields': ('title', 'slug',)}),
-	('News texts', {'fields': ('full', 'full_prepared', 'allow_comments',)}),
-	('Source data', {'fields': ('link', 'source',)}),
-	('Date of source publishing', {'fields': ('date',), 'classes': 'collapse'}),
+	(None, {'fields': ('title',
+			   'slug',)}),
+	('News texts', {'fields': ('full',
+				   'full_prepared',
+				   'allow_comments',)}),
+	('Source data', {'fields': ('link',
+				    'source',)}),
+	('Date of source publishing', {'fields': ('date',
+						  'date_start_publication'),
+	                               'classes': 'collapse'}),
     ]
 admin.site.register(Element, ElementAdmin)
diff --git a/macdac/static/css/style.css b/macdac/static/css/style.css
@@ -128,6 +128,26 @@ footer {
 		padding: 1px 25px 1px 50px;
 		background: url("/static/img/news-element-odd-bg.gif") repeat -33% 33% #e7e7e7;
 	}
+		/* Humane lists */
+		#news-element article ul li {
+			behavior:expression( !this.before && this.parentNode && this.parentNode.nodeName == 'UL' ? this.before = this.innerHTML = '&mdash;&nbsp;' + this.innerHTML : '' );
+			text-indent:expression( this.parentNode && this.parentNode.nodeName == 'UL' ? '-1.3em' : 0 );
+			margin: 0.5em 0;
+		}
+		#news-element article ul > li:before {
+			content: '\2014\a0';
+		}
+		#news-element article ul,
+		#news-element article ol {
+			margin: 0 0 1.2em 2.6em;
+			padding: 0;
+		}
+		#news-element article ul {
+			list-style-type: none;
+		}
+		#news-element article ol {
+			list-style-type: decimal;
+		}
 	#after-element {
 		padding: 25px 25px 25px 50px;
 	}

diff --git a/macdac/static/macdac/81102.jpg b/macdac/static/macdac/81102.jpg
diff --git a/macdac/static/macdac/82271/1.jpg b/macdac/static/macdac/82271/1.jpg
diff --git a/macdac/static/macdac/82271/2.jpg b/macdac/static/macdac/82271/2.jpg
diff --git a/macdac/static/macdac/82271/3.jpg b/macdac/static/macdac/82271/3.jpg
diff --git a/macdac/static/macdac/82271/4.jpg b/macdac/static/macdac/82271/4.jpg
diff --git a/macdac/static/macdac/82377/1.jpg b/macdac/static/macdac/82377/1.jpg
diff --git a/macdac/static/macdac/82377/2.jpg b/macdac/static/macdac/82377/2.jpg
diff --git a/macdac/static/macdac/82377/3.jpg b/macdac/static/macdac/82377/3.jpg
diff --git a/macdac/static/macdac/82377/4.jpg b/macdac/static/macdac/82377/4.jpg
diff --git a/macdac/static/macdac/82377/5.jpg b/macdac/static/macdac/82377/5.jpg
diff --git a/macdac/static/macdac/82377/6.jpg b/macdac/static/macdac/82377/6.jpg
diff --git a/macdac/static/macdac/82819/1.jpg b/macdac/static/macdac/82819/1.jpg
diff --git a/macdac/static/macdac/83754/1.png b/macdac/static/macdac/83754/1.png
diff --git a/macdac/static/macdac/83754/2.png b/macdac/static/macdac/83754/2.png
diff --git a/macdac/static/macdac/83754/3.png b/macdac/static/macdac/83754/3.png
diff --git a/macdac/static/macdac/83754/4.png b/macdac/static/macdac/83754/4.png
diff --git a/macdac/static/macdac/83754/5.png b/macdac/static/macdac/83754/5.png
diff --git a/macdac/static/macdac/83876/1.jpg b/macdac/static/macdac/83876/1.jpg
diff --git a/macdac/static/macdac/83876/2.jpg b/macdac/static/macdac/83876/2.jpg
diff --git a/macdac/static/macdac/83876/3.jpg b/macdac/static/macdac/83876/3.jpg
diff --git a/macdac/static/macdac/83876/4.jpg b/macdac/static/macdac/83876/4.jpg
diff --git a/macdac/static/macdac/85529/1.png b/macdac/static/macdac/85529/1.png
diff --git a/macdac/static/macdac/85529/2.png b/macdac/static/macdac/85529/2.png
diff --git a/macdac/static/macdac/85529/3.png b/macdac/static/macdac/85529/3.png
diff --git a/macdac/static/macdac/85529/4.png b/macdac/static/macdac/85529/4.png
diff --git a/macdac/static/macdac/85529/5.png b/macdac/static/macdac/85529/5.png
diff --git a/macdac/static/macdac/85529/6.png b/macdac/static/macdac/85529/6.png
diff --git a/macdac/static/macdac/85529/7.png b/macdac/static/macdac/85529/7.png
diff --git a/macdac/static/macdac/85529/8.png b/macdac/static/macdac/85529/8.png
diff --git a/macdac/static/macdac/85529/9.png b/macdac/static/macdac/85529/9.png