add XML to allowed file types list, fix titles

This commit is contained in:
Kyle Drake 2015-04-08 10:34:57 -07:00
parent 0ccf82f4ad
commit 1867e12c36
7 changed files with 17 additions and 8 deletions

View file

@ -4,6 +4,9 @@ get '/browse/?' do
site_dataset = site_dataset.paginate @current_page, Site::BROWSE_PAGINATION_LENGTH site_dataset = site_dataset.paginate @current_page, Site::BROWSE_PAGINATION_LENGTH
@page_count = site_dataset.page_count || 1 @page_count = site_dataset.page_count || 1
@sites = site_dataset.all @sites = site_dataset.all
if params[:tag]
@title = "Sites tagged #{params[:tag]}"
end
erb :browse erb :browse
end end

View file

@ -68,5 +68,6 @@ get '/press' do
end end
get '/legal/?' do get '/legal/?' do
@title = 'Legal Guide to Neocities'
erb :'legal' erb :'legal'
end end

View file

@ -1,5 +1,6 @@
get '/signin/?' do get '/signin/?' do
dashboard_if_signed_in dashboard_if_signed_in
@title = 'Sign In'
erb :'signin' erb :'signin'
end end
@ -47,4 +48,4 @@ end
def signout def signout
session[:id] = nil session[:id] = nil
end end

View file

@ -5,6 +5,7 @@ get '/surf/?' do
@page_count = site_dataset.page_count || 1 @page_count = site_dataset.page_count || 1
@site = site_dataset.first @site = site_dataset.first
redirect "/browse?#{Rack::Utils.build_query params}" if @site.nil? redirect "/browse?#{Rack::Utils.build_query params}" if @site.nil?
@title = "Surf Mode - #{@site.title}"
erb :'surf', layout: false erb :'surf', layout: false
end end

View file

@ -13,6 +13,7 @@
<li>JavaScript (.js, .json, .geojson)</li> <li>JavaScript (.js, .json, .geojson)</li>
<li>CSS (.css)</li> <li>CSS (.css)</li>
<li>Text (.txt, .text, .csv, .tsv)</li> <li>Text (.txt, .text, .csv, .tsv)</li>
<li>XML (.xml)</li>
<li>Web Fonts (.eot, .ttf, .woff, .woff2, .svg)</li> <li>Web Fonts (.eot, .ttf, .woff, .woff2, .svg)</li>
<li>MIDI Files (.mid, .midi)</li> <li>MIDI Files (.mid, .midi)</li>
</ul> </ul>

View file

@ -2,11 +2,7 @@
<html> <html>
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<% if @title %> <title><%= title %></title>
<title><%= @title %> - Neocities</title>
<% else %>
<title>Neocities</title>
<% end %>
<link href="/css/font-awesome.css" rel="stylesheet"> <link href="/css/font-awesome.css" rel="stylesheet">
<link href="/css/bootstrap.min.css" rel="stylesheet"> <link href="/css/bootstrap.min.css" rel="stylesheet">
<style> <style>

View file

@ -243,10 +243,16 @@
Using the Services for any activity that adversely affects the ability of other people or systems to use Neocities. This includes "denial of service" (DoS) attacks against another network host or individual user. Interference with or disruption of other network users, network services, websites or network equipment is prohibited. A User may not, through action or inaction, allow others to use their account for access for illegal or inappropriate actions. A User may not permit their account, through action or inaction, to be configured in such a way that gives a third party the capability to use their account in an illegal or inappropriate manner. Using the Services for any activity that adversely affects the ability of other people or systems to use Neocities. This includes "denial of service" (DoS) attacks against another network host or individual user. Interference with or disruption of other network users, network services, websites or network equipment is prohibited. A User may not, through action or inaction, allow others to use their account for access for illegal or inappropriate actions. A User may not permit their account, through action or inaction, to be configured in such a way that gives a third party the capability to use their account in an illegal or inappropriate manner.
</p> </p>
<p>
<strong>Auto-generating sites from pre-fabricated templates for other people</strong>
<br>
Using the Neocities API to generate a Neocities site for other people from a different web service is prohibited without our consent, unless that generating service is being completely operated by the owner of the web site on Neocities. This does not apply to any services providing HTML editing capabilities that use Neocities to save web sites edited by the user. This policy is in place due to third party services using Neocities to create SEO spam for their services. We can make exceptions to this, please contact us if you believe you have a legitimate use case.
</p>
<p> <p>
<strong>ENFORCEMENT</strong> <strong>ENFORCEMENT</strong>
<br> <br>
Neocities' reserves the right to suspend, block or cancel access to any and all Services when, in our judgment and sole discretion, an account may have violated this AUP. Neocities, by way of example and not limitation, may take any one or more of the following actions in response to complaints of conduct that amounts to a violation of this AUP: Neocities' reserves the right to suspend, block or cancel access to any and all Services when, in our judgment and sole discretion, an account may have violated this AUP. Neocities, by way of example and not limitation, may take any one or more of the following actions in response to complaints of conduct that amounts to a violation of this AUP:
<ul> <ul>
<li>Suspension of account, or blocking of access to Neocities services.</li> <li>Suspension of account, or blocking of access to Neocities services.</li>
@ -320,4 +326,4 @@
<p> <p>
Please contact the Designated Agent to Receive Notification of Claimed Infringement for Company at https://neocities.org/contact. Please contact the Designated Agent to Receive Notification of Claimed Infringement for Company at https://neocities.org/contact.
</p> </p>
</div> </div>