odania_timeline 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0c966af669fc708871744d7416c17dee99ff81b
-  data.tar.gz: 8855e8dd7d3b8397077c869db45e0a5d3c2e3394
+  metadata.gz: 26a3e0ab5ab497daa61bcbf8dc6a9fe8e04321fc
+  data.tar.gz: 2bfb6cc81ef122eb570d90379a25319eab536589
 SHA512:
-  metadata.gz: 43597605c638e300a39ad7d69be39e62a1c6119de06db748d03bc924c32cebfb09db3f3df282885a71ae82788dc5982b1372f8cf57d8078ae31f602464f44702
-  data.tar.gz: 9afba8aae677dc897a3dfdeb98a740a94a88a8d8ac20ba09ee666ad2c8a13a68c526989f8a0ee3105ff79b95468d84af561c196f29dee537a03376b543abd8fb
+  metadata.gz: 052d59f66ac165244ab2d519d4d334fec16b701c1f6e369ccc85f5687ae8e688bb11b19534e55ad94fa1e0131331bd3b3b2db94071db5e83928c113298ac22b7
+  data.tar.gz: eb1dc3a9d40774d3a64977ba19a069f31b8b5cff0e10a1017299bf8d6905c2cd2bb5590284bd5d523f5e980fbea70402736323a2f147c02afd448063294378db

data/README.rdoc

@@ -2,6 +2,6 @@
 
 Odania Timeline is aplugin for the Odania Portal. It gives you the possibility to define and display timelines.
 
-Active the plugin "odania_timeline" in the admin tool for a site. Afterwords you can define the data in the protected area.
+Active the plugin "odania_timeline" in the admin tool for a site. Afterwords users can define the data in the protected area.
 
 This project rocks and uses MIT-LICENSE.

data/app/assets/javascripts/odania_timeline/controllers/timelines/edit_timeline_controller.js

@@ -9,7 +9,8 @@ app.controller('OdaniaTimelineEditTimelineController', ['$location', '$scope', '
 			var contents;
 			for (var i=0 ; i<$scope.timeline.timeline_contents.length ; i++) {
 				contents = $scope.timeline.timeline_contents[i];
-				contents.timeline_date = new Date(parseInt(contents.timeline_date));
+				contents.from_date = new Date(parseInt(contents.from_date));
+				contents.to_date = new Date(parseInt(contents.to_date));
 			}
 		});
 	}

data/app/controllers/odania_timeline/timelines_controller.rb

@@ -1,4 +1,6 @@
 class OdaniaTimeline::TimelinesController < ApplicationController
+	before_action :valid_site!
+
 	def index
 		@timelines = OdaniaTimeline::Timeline.where(is_public: true).order('updated_at DESC')
 	end

data/app/controllers/protected/api/odania_timeline/timelines_controller.rb

@@ -46,6 +46,6 @@ class Protected::Api::OdaniaTimeline::TimelinesController < Protected::ApiContro
 	end
 
 	def timeline_params
-		params.require(:timeline).permit(:title, :is_public, timeline_contents_attributes: [:id, :title, :body, :timeline_date])
+		params.require(:timeline).permit(:title, :is_public, timeline_contents_attributes: [:id, :title, :body, :from_date, :to_date])
 	end
 end

data/app/models/odania_timeline/timeline_content.rb

@@ -3,5 +3,5 @@ class OdaniaTimeline::TimelineContent < ActiveRecord::Base
 
 	validates_length_of :title, minimum: 2
 	validates_length_of :body, minimum: 5
-	validates_presence_of :timeline_date
+	validates_presence_of :from_date
 end

data/app/views/odania_timeline/timelines/_show.html.erb

@@ -1,9 +1,14 @@
 <h2 class="right-line"><%= timeline.title %></h2>
 
 <ul class="timeline-2">
-	<% timeline.timeline_contents.each do |timeline_content| %>
+	<% timeline.timeline_contents.order('from_date DESC').each do |timeline_content| %>
 		<li class="wow fadeInRight">
-			<time class="timeline-time" datetime=""><%= timeline_content.timeline_date %></time>
+			<time class="timeline-time" datetime="">
+				<%=l timeline_content.from_date %>
+				<% unless timeline_content.to_date.nil? %>
+					- <%=l timeline_content.to_date %>
+				<% end %>
+			</time>
 			<i class="timeline-2-point"></i>
 
 			<div class="panel panel-default">

data/app/views/protected/api/odania_timeline/timeline_contents/_show.json.jbuilder

@@ -1,4 +1,5 @@
 json.id timeline_content.id
-json.timeline_date date_to_time_since_epoch(timeline_content.timeline_date)
+json.from_date date_to_time_since_epoch(timeline_content.from_date)
+json.to_date date_to_time_since_epoch(timeline_content.to_date)
 json.title timeline_content.title
 json.body timeline_content.body

data/app/views/protected/api/odania_timeline/timelines/_show.json.jbuilder

@@ -3,4 +3,4 @@ json.title timeline.title
 json.language_id timeline.language_id
 json.is_public timeline.is_public
 
-json.timeline_contents timeline.timeline_contents, partial: 'protected/api/odania_timeline/timeline_contents/show', as: :timeline_content
+json.timeline_contents timeline.timeline_contents.order('from_date DESC'), partial: 'protected/api/odania_timeline/timeline_contents/show', as: :timeline_content

data/app/views/protected/odania_timeline/timelines/_choose_timeline.html.erb

@@ -1,5 +1,5 @@
 <div class="field">
-	<label>Contact List</label>
+	<label>Timeline</label>
 	<select data-ng-model="targetData.id" data-ng-options="timeline.id as timeline.title for timeline in data.timelines"></select>
 	<br/>
 </div>

data/app/views/protected/template/templates/odania_timeline/timelines/_edit.html.erb

@@ -17,11 +17,20 @@
 					<legend>Timeline Content {{ $index + 1 }}</legend>
 
 					<div class="form-group">
-						<label class="col-sm-2 control-label">Date</label>
+						<label class="col-sm-2 control-label">Start Date</label>
 
 						<div class="col-sm-10">
-							<input type="date" data-ng-model="timeline.timeline_contents[$index].timeline_date" placeholder="Release date" class="form-control"/>
-							<span data-ng-if="errors.timeline_contents[$index].timeline_date" style="color: red;">{{ printErrors(errors.timeline_contents[$index].timeline_date) }}</span>
+							<input type="date" data-ng-model="timeline.timeline_contents[$index].from_date" placeholder="Start date" class="form-control"/>
+							<span data-ng-if="errors.timeline_contents[$index].from_date" style="color: red;">{{ printErrors(errors.timeline_contents[$index].from_date) }}</span>
+						</div>
+					</div>
+
+					<div class="form-group">
+						<label class="col-sm-2 control-label">End Date</label>
+
+						<div class="col-sm-10">
+							<input type="date" data-ng-model="timeline.timeline_contents[$index].to_date" placeholder="Start date" class="form-control"/>
+							<span data-ng-if="errors.timeline_contents[$index].to_date" style="color: red;">{{ printErrors(errors.timeline_contents[$index].to_date) }}</span>
 						</div>
 					</div>
 

data/app/views/protected/template/templates/odania_timeline/timelines/_show.html.erb

@@ -10,7 +10,7 @@
 
 <div data-ng-repeat="timelineContent in timeline.timeline_contents">
 	<hr/>
-	<strong>{{ timelineContent.timeline_date }}: {{ timelineContent.title }}</strong>
+	<strong>{{ timelineContent.from_date }} - {{ timelineContent.to_date }}: {{ timelineContent.title }}</strong>
 	<div data-ng-html="{{ timelineContent.body }}"></div>
 </div>
 

data/db/migrate/20150401192045_add_date_column.rb

@@ -0,0 +1,6 @@
+class AddDateColumn < ActiveRecord::Migration
+	def change
+		rename_column :odania_timeline_timeline_contents, :timeline_date, :from_date
+		add_column :odania_timeline_timeline_contents, :to_date, :date
+	end
+end

data/lib/odania_timeline/version.rb

@@ -1,3 +1,3 @@
 module OdaniaTimeline
-	VERSION = '0.0.2'
+	VERSION = '0.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: odania_timeline
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Mike Petersen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-30 00:00:00.000000000 Z
+date: 2015-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -80,6 +80,7 @@ files:
 - config/routes.rb
 - db/migrate/20150327172503_create_odania_timeline_timelines.rb
 - db/migrate/20150327172813_create_odania_timeline_timeline_contents.rb
+- db/migrate/20150401192045_add_date_column.rb
 - lib/odania_timeline.rb
 - lib/odania_timeline/engine.rb
 - lib/odania_timeline/engine_target_type.rb