diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 00000000..838665f1 Binary files /dev/null and b/.DS_Store differ diff --git a/app/assets/images/.DS_Store b/app/assets/images/.DS_Store new file mode 100644 index 00000000..ecbcf156 Binary files /dev/null and b/app/assets/images/.DS_Store differ diff --git a/app/assets/images/background2-for-repeating.jpg b/app/assets/images/background2-for-repeating.jpg new file mode 100644 index 00000000..946cfa6b Binary files /dev/null and b/app/assets/images/background2-for-repeating.jpg differ diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 85290903..015b6244 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -23,7 +23,7 @@ img {border:0; padding:0; margin:0; display:block; text-indent:-9999px;} html, body, .main, .wrapper, #container { height: 100%; } html { } -body { background:#031924 url(background2.jpg) repeat 0 0; font-family: 'katarine-web', sans-serif; background-attachment:fixed; color:#FFF; } +body { background:#031924 url(background2-for-repeating.jpg) repeat 0 0; font-family: 'katarine-web', sans-serif; background-attachment:fixed; color:#FFF; } h1,h2,h3,h4,h5,h6 { font-weight:normal; } h1 {display:block; text-align:left; font-family: "vinyl",sans-serif; } diff --git a/app/views/main/home.html.erb b/app/views/main/home.html.erb deleted file mode 100644 index 0f9e900c..00000000 --- a/app/views/main/home.html.erb +++ /dev/null @@ -1,25 +0,0 @@ -<% unless @item.nil? %> -
-
-
-
-
-
-
-
- -<% end %> -<% if @item.nil? %> -


Shucks, there is nothing in metamaps.

-<% end %> - -<% if authenticated? %> - <%= render :partial => 'items/new' %> - <%= render :partial => 'synapses/new' %> -<% end %> - diff --git a/config/.database.yml.swp b/config/.database.yml.swp new file mode 100644 index 00000000..35515eaa Binary files /dev/null and b/config/.database.yml.swp differ diff --git a/config/database.yml b/config/database.yml index cfbcbb41..c1587681 100644 --- a/config/database.yml +++ b/config/database.yml @@ -1,32 +1,32 @@ development: - min_messages: WARNING - adapter: postgresql - host: ec2-54-243-188-58.compute-1.amazonaws.com - port: 5442 - encoding: unicode - database: da81fvorvn5pp9 - pool: 5 - username: yolhqgtlivenrk - password: "oi_EAZwbXboYjqB_9tWPh2x5YS" - -test: min_messages: WARNING adapter: postgresql host: 127.0.0.1 port: 5432 encoding: unicode - database: metamap002_test + database: metamap002_development pool: 5 username: postgres password: "3112" +test: + min_messages: WARNING + adapter: postgresql + host: ec2-107-21-107-194.compute-1.amazonaws.com + port: 5432 + encoding: unicode + database: ddcrn2lgphjk9k + pool: 5 + username: qqpckkahytovwv + password: "njeP6cMA8EjM9ukHk9s3ReOdy7" + production: min_messages: WARNING adapter: postgresql - host: ec2-54-243-188-58.compute-1.amazonaws.com - port: 5442 + host: ec2-107-21-107-194.compute-1.amazonaws.com + port: 5432 encoding: unicode - database: da81fvorvn5pp9 + database: ddcrn2lgphjk9k pool: 5 - username: yolhqgtlivenrk - password: "oi_EAZwbXboYjqB_9tWPh2x5YS" + username: qqpckkahytovwv + password: "njeP6cMA8EjM9ukHk9s3ReOdy7"