Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

revert

  • Loading branch information...
commit a0504bbf358b2b3cdb6e908909553bd72194f4c6 1 parent 1e1e926
XeroCodeIT authored April 30, 2012
2  Gemfile
@@ -14,7 +14,7 @@ gem 'heroku'
14 14
 gem 'devise'
15 15
 gem 'feedzirra'
16 16
 gem 'rb-readline'
17  
-gem 'forem', :git=>"git://github.com/radar/forem.git"
  17
+#gem 'forem', :git=>"git://github.com/radar/forem.git"
18 18
 #gem 'forem', :git=>"git://github.com/PendragonDevelopment/forem.git"
19 19
 gem 'rails_log_stdout'
20 20
 gem 'faye'
28  Gemfile.lock
... ...
@@ -1,14 +1,3 @@
1  
-GIT
2  
-  remote: git://github.com/radar/forem.git
3  
-  revision: 515839e73bccbcb2f228e23082538bc86e7114fc
4  
-  specs:
5  
-    forem (1.0.0.beta1)
6  
-      cancan
7  
-      forem-redcarpet (= 1.0.0)
8  
-      rails (~> 3.1)
9  
-      simple_form
10  
-      workflow (= 0.8.0)
11  
-
12 1
 GEM
13 2
   remote: https://rubygems.org/
14 3
   specs:
@@ -42,12 +31,10 @@ GEM
42 31
     addressable (2.2.7)
43 32
     arel (3.0.2)
44 33
     bcrypt-ruby (3.0.1)
45  
-    blankslate (2.1.2.4)
46 34
     bootstrap-sass (2.0.0)
47 35
     bootstrap-will_paginate (0.0.5)
48 36
       will_paginate
49 37
     builder (3.0.0)
50  
-    cancan (1.6.7)
51 38
     coffee-rails (3.2.2)
52 39
       coffee-script (>= 2.2.0)
53 40
       railties (~> 3.2.0)
@@ -91,10 +78,6 @@ GEM
91 78
       loofah (>= 0.3.1)
92 79
       nokogiri (> 0.0.0)
93 80
       sax-machine (>= 0.0.12)
94  
-    ffi (1.0.11)
95  
-    forem-redcarpet (1.0.0)
96  
-      pygments.rb (= 0.2.4)
97  
-      redcarpet (= 2.0.1)
98 81
     heroku (2.24.1)
99 82
       launchy (>= 0.3.2)
100 83
       netrc (~> 0.7.1)
@@ -125,8 +108,6 @@ GEM
125 108
     orm_adapter (0.0.7)
126 109
     pg (0.13.2)
127 110
     polyglot (0.3.3)
128  
-    pygments.rb (0.2.4)
129  
-      rubypython (~> 0.5.3)
130 111
     rack (1.4.1)
131 112
     rack-cache (1.2)
132 113
       rack (>= 0.4)
@@ -155,12 +136,8 @@ GEM
155 136
     rb-readline (0.4.2)
156 137
     rdoc (3.12)
157 138
       json (~> 1.4)
158  
-    redcarpet (2.0.1)
159 139
     rest-client (1.6.7)
160 140
       mime-types (>= 1.16)
161  
-    rubypython (0.5.3)
162  
-      blankslate (>= 2.1.2.3)
163  
-      ffi (~> 1.0.7)
164 141
     rubyzip (0.9.7)
165 142
     sass (3.1.15)
166 143
     sass-rails (3.2.4)
@@ -169,9 +146,6 @@ GEM
169 146
       tilt (~> 1.3)
170 147
     sax-machine (0.1.0)
171 148
       nokogiri (> 0.0.0)
172  
-    simple_form (2.0.2)
173  
-      actionpack (~> 3.0)
174  
-      activemodel (~> 3.0)
175 149
     sprockets (2.1.2)
176 150
       hike (~> 1.2)
177 151
       rack (~> 1.0)
@@ -194,7 +168,6 @@ GEM
194 168
     warden (1.1.1)
195 169
       rack (>= 1.0)
196 170
     will_paginate (3.0.3)
197  
-    workflow (0.8.0)
198 171
 
199 172
 PLATFORMS
200 173
   ruby
@@ -209,7 +182,6 @@ DEPENDENCIES
209 182
   faker (= 1.0.1)
210 183
   faye
211 184
   feedzirra
212  
-  forem!
213 185
   heroku
214 186
   jquery-rails (= 2.0.0)
215 187
   nifty-generators
2  app/assets/javascripts/application.js
@@ -18,7 +18,7 @@ $(function() {
18 18
   // var faye = new Faye.Client('http://fierce-winter-5661.herokuapp.com/faye');
19 19
   // var faye = new Faye.Client('http://localhost:9292/faye');
20 20
   // var faye = new Faye.Client('http://xerocode.com/faye');
21  
-     var faye = new Faye.Client('https://fayeredis.herokuapp.com/faye');
  21
+     var faye = new Faye.Client('http://fayeredis.herokuapp.com/faye');
22 22
 
23 23
   faye.subscribe("/messages/new", function(data) {
24 24
     eval(data);
0  app/assets/stylesheets/stylesheets.zip 100755 → 100644
File mode changed
6  app/controllers/application_controller.rb
... ...
@@ -1,9 +1,3 @@
1 1
 class ApplicationController < ActionController::Base
2  
-
3  
-  def forem_user
4  
-    current_user
5  
-  end
6  
-  helper_method :forem_user
7  
-
8 2
   protect_from_forgery
9 3
 end
0  app/controllers/messages_controller.rb 100755 → 100644
File mode changed
2  app/helpers/application_helper.rb
@@ -12,7 +12,7 @@ def full_title(page_title)
12 12
 
13 13
   def broadcast(channel, &block)
14 14
     message = {:channel => channel, :data => capture(&block), :ext => {:auth_token => FAYE_TOKEN}}
15  
-     uri = URI.parse("https://fayeredis.herokuapp.com/faye")    
  15
+     uri = URI.parse("http://fayeredis.herokuapp.com/faye")    
16 16
     #uri = URI.parse("http://localhost:9292/faye")
17 17
     #uri = URI.parse("http://fierce-winter-5661.herokuapp.com/faye")
18 18
     #uri = URI.parse("http://xerocode.com/faye")
0  app/models/message.rb 100755 → 100644
File mode changed
33  app/views/layouts/_header.html.erb
@@ -2,37 +2,24 @@
2 2
 	<div id="banner">
3 3
 		<p>CMS</p>
4 4
 	</div>
5  
-
6  
-<header>
7  
-    <nav>
8  
-        <% if user_signed_in? %>
9  
-              <%= link_to "Sign out", main_app.destroy_user_session_path, :method => :delete %>
10  
-              <%= link_to "Administrate", forem.admin_root_url %>
11  
-        <% else %>
12  
-            <%= link_to "Sign up", main_app.new_user_registration_path %>
13  
-            | <%= link_to "Sign in", main_app.new_user_session_path %>
14  
-        <% end %>
15  
-    </nav>
16  
-</header>
17  
-
18 5
 	<div id="centeredmenu">
19 6
 		<ul id="list-nav">
20 7
 		  <li><%= link_to "Sākums",    root_path %></li>
21  
-		  <li><%= link_to "Palīdzība",   '#' %></li>
22  
-		  <li><%= link_to "Par CMS",   '#' %></li>
23  
-		  <li><%= link_to "Kontakti", '#' %></li>
24  
-		  <li><%= link_to "Forums",   '#' %></li>
25  
-		  <li><%= link_to "Čats",    '#' %></li>
26  
-		  <li><%= link_to "RSS",     '#' %></li>
  8
+		  <li><%= link_to "Palīdzība",    help_path %></li>
  9
+		  <li><%= link_to "Par CMS",   about_path %></li>
  10
+		  <li><%= link_to "Kontakti", contact_path %></li>
  11
+		  <li><%= link_to "Forums",   forum_path %></li>
  12
+		  <li><%= link_to "Čats",    chat_path %></li>
  13
+		  <li><%= link_to "RSS",     rss_path %></li>
27 14
 
28 15
 		  <% if user_signed_in? %>
29 16
 		    <li><%= link_to "Lietotāji", '#' %></li>
30 17
 		    <li><%= link_to "Profile", '#' %></li>
31  
-		    <li><%= link_to "Uzstādījumi", '#'%></li>
32  
-                    <li><%= link_to "Iziet", '#', :method => :delete%></li>
33  
-<!-- edit_user_registration_path , destroy_user_session_path -->
  18
+		    <li><%= link_to "Uzstādījumi", edit_user_registration_path %></li>
  19
+                    <li><%= link_to "Iziet", destroy_user_session_path, :method => :delete%></li>
  20
+
34 21
 		  <% else %>
35  
-		    <li><%= link_to "Autorizēties" %></li> <!--  user_session_path -->
  22
+		    <li><%= link_to "Autorizēties", user_session_path %></li>
36 23
 		  <% end %>
37 24
 		</ul>
38 25
 	</div>
2  app/views/layouts/application.html.erb
@@ -7,7 +7,7 @@
7 7
     <title><%= full_title(yield(:title)) %></title>
8 8
 
9 9
     <%= javascript_include_tag "application" %>
10  
-    <%= javascript_include_tag "https://fayeredis.herokuapp.com/faye.js" %>
  10
+    <%= javascript_include_tag "http://fayeredis.herokuapp.com/faye.js" %>
11 11
     <!--<%= javascript_include_tag "http://localhost:9292/faye.js" %>-->
12 12
     <!--<%= javascript_include_tag "http://fierce-winter-5661.herokuapp.com/faye.js" %>-->
13 13
     <!--<%= javascript_include_tag "http://xerocode.com/faye.js" %>-->
0  app/views/messages/_message.html.erb 100755 → 100644
File mode changed
0  app/views/messages/create.js.erb 100755 → 100644
File mode changed
0  app/views/messages/index.html.erb 100755 → 100644
File mode changed
0  config/initializers/faye_token.rb 100755 → 100644
File mode changed
3  config/routes.rb
... ...
@@ -1,5 +1,4 @@
1 1
 SampleApp::Application.routes.draw do
2  
-  mount Forem::Engine, :at => "/forums"
3 2
   devise_for :users
4 3
   resources :devise
5 4
 
@@ -16,7 +15,7 @@
16 15
   match '/chat',    to: 'messages#index'
17 16
   match '/rss',     to: 'static_pages#rss'
18 17
 
19  
-  resources :help
  18
+
20 19
   #match '/faye',    to: '/faye'
21 20
   #match '/faye.js', to: 'faye.js'
22 21
   # faye
110  db/schema.rb
@@ -11,13 +11,7 @@
11 11
 #
12 12
 # It's strongly recommended to check this file into your version control system.
13 13
 
14  
-ActiveRecord::Schema.define(:version => 20120430044466) do
15  
-
16  
-  create_table "chatlines", :force => true do |t|
17  
-    t.text     "content"
18  
-    t.datetime "created_at", :null => false
19  
-    t.datetime "updated_at", :null => false
20  
-  end
  14
+ActiveRecord::Schema.define(:version => 20120423005408) do
21 15
 
22 16
   create_table "feed_entries", :force => true do |t|
23 17
     t.string   "name"
@@ -29,99 +23,6 @@
29 23
     t.datetime "updated_at",   :null => false
30 24
   end
31 25
 
32  
-  create_table "forem_categories", :force => true do |t|
33  
-    t.string   "name",       :null => false
34  
-    t.datetime "created_at", :null => false
35  
-    t.datetime "updated_at", :null => false
36  
-  end
37  
-
38  
-  create_table "forem_forums", :force => true do |t|
39  
-    t.string  "title"
40  
-    t.text    "description"
41  
-    t.integer "category_id"
42  
-    t.integer "views_count", :default => 0
43  
-  end
44  
-
45  
-  create_table "forem_groups", :force => true do |t|
46  
-    t.string "name"
47  
-  end
48  
-
49  
-  add_index "forem_groups", ["name"], :name => "index_forem_groups_on_name"
50  
-
51  
-  create_table "forem_memberships", :force => true do |t|
52  
-    t.integer "group_id"
53  
-    t.integer "member_id"
54  
-  end
55  
-
56  
-  add_index "forem_memberships", ["group_id"], :name => "index_forem_memberships_on_group_id"
57  
-
58  
-  create_table "forem_moderator_groups", :force => true do |t|
59  
-    t.integer "forum_id"
60  
-    t.integer "group_id"
61  
-  end
62  
-
63  
-  add_index "forem_moderator_groups", ["forum_id"], :name => "index_forem_moderator_groups_on_forum_id"
64  
-
65  
-  create_table "forem_posts", :force => true do |t|
66  
-    t.integer  "topic_id"
67  
-    t.text     "text"
68  
-    t.integer  "user_id"
69  
-    t.datetime "created_at",                                :null => false
70  
-    t.datetime "updated_at",                                :null => false
71  
-    t.integer  "reply_to_id"
72  
-    t.string   "state",       :default => "pending_review"
73  
-    t.boolean  "notified",    :default => false
74  
-  end
75  
-
76  
-  add_index "forem_posts", ["reply_to_id"], :name => "index_forem_posts_on_reply_to_id"
77  
-  add_index "forem_posts", ["state"], :name => "index_forem_posts_on_state"
78  
-  add_index "forem_posts", ["topic_id"], :name => "index_forem_posts_on_topic_id"
79  
-  add_index "forem_posts", ["user_id"], :name => "index_forem_posts_on_user_id"
80  
-
81  
-  create_table "forem_subscriptions", :force => true do |t|
82  
-    t.integer "subscriber_id"
83  
-    t.integer "topic_id"
84  
-  end
85  
-
86  
-  create_table "forem_topics", :force => true do |t|
87  
-    t.integer  "forum_id"
88  
-    t.integer  "user_id"
89  
-    t.string   "subject"
90  
-    t.datetime "created_at",                                 :null => false
91  
-    t.datetime "updated_at",                                 :null => false
92  
-    t.boolean  "locked",       :default => false,            :null => false
93  
-    t.boolean  "pinned",       :default => false
94  
-    t.boolean  "hidden",       :default => false
95  
-    t.datetime "last_post_at"
96  
-    t.string   "state",        :default => "pending_review"
97  
-    t.integer  "views_count",  :default => 0
98  
-  end
99  
-
100  
-  add_index "forem_topics", ["forum_id"], :name => "index_forem_topics_on_forum_id"
101  
-  add_index "forem_topics", ["state"], :name => "index_forem_topics_on_state"
102  
-  add_index "forem_topics", ["user_id"], :name => "index_forem_topics_on_user_id"
103  
-
104  
-  create_table "forem_views", :force => true do |t|
105  
-    t.integer  "user_id"
106  
-    t.integer  "viewable_id"
107  
-    t.datetime "created_at"
108  
-    t.datetime "updated_at"
109  
-    t.integer  "count",             :default => 0
110  
-    t.string   "viewable_type"
111  
-    t.datetime "current_viewed_at"
112  
-    t.datetime "past_viewed_at"
113  
-  end
114  
-
115  
-  add_index "forem_views", ["updated_at"], :name => "index_forem_views_on_updated_at"
116  
-  add_index "forem_views", ["user_id"], :name => "index_forem_views_on_user_id"
117  
-  add_index "forem_views", ["viewable_id"], :name => "index_forem_views_on_topic_id"
118  
-
119  
-  create_table "messages", :force => true do |t|
120  
-    t.text     "content"
121  
-    t.datetime "created_at", :null => false
122  
-    t.datetime "updated_at", :null => false
123  
-  end
124  
-
125 26
   create_table "microposts", :force => true do |t|
126 27
     t.string   "content"
127 28
     t.integer  "user_id"
@@ -145,12 +46,12 @@
145 46
   create_table "users", :force => true do |t|
146 47
     t.string   "name"
147 48
     t.string   "email"
148  
-    t.datetime "created_at",                                           :null => false
149  
-    t.datetime "updated_at",                                           :null => false
  49
+    t.datetime "created_at",                                :null => false
  50
+    t.datetime "updated_at",                                :null => false
150 51
     t.string   "password_digest"
151 52
     t.string   "remember_token"
152 53
     t.boolean  "admin",                  :default => false
153  
-    t.string   "encrypted_password",     :default => "",               :null => false
  54
+    t.string   "encrypted_password",     :default => "",    :null => false
154 55
     t.string   "reset_password_token"
155 56
     t.datetime "reset_password_sent_at"
156 57
     t.datetime "remember_created_at"
@@ -159,9 +60,6 @@
159 60
     t.datetime "last_sign_in_at"
160 61
     t.string   "current_sign_in_ip"
161 62
     t.string   "last_sign_in_ip"
162  
-    t.boolean  "forem_admin",            :default => false
163  
-    t.string   "forem_state",            :default => "pending_review"
164  
-    t.boolean  "forem_auto_subscribe",   :default => false
165 63
   end
166 64
 
167 65
   add_index "users", ["email"], :name => "index_users_on_email", :unique => true
0  faye.ru 100755 → 100644
File mode changed
0  h.txt 100755 → 100644
File mode changed
0  h2.txt 100755 → 100644
File mode changed

0 notes on commit a0504bb

Please sign in to comment.
Something went wrong with that request. Please try again.