Merge branch 'newdesign' of github.com:kyledrake/neocities-web into newdesign

This commit is contained in:
Kyle Drake 2013-07-13 22:09:02 -04:00
commit b2aacfe34d
8 changed files with 248 additions and 227 deletions

View file

@ -6,7 +6,7 @@
.header-Base{
background:#65a0ad;
border-bottom:6px solid #e93250;
min-height:47px;
min-height:42px;
overflow:hidden;
}
@ -181,11 +181,16 @@
.status-Nav{
float:right;
li{float:left}
@media (max-device-width:480px), screen and (max-width:800px){
float:none;
}
li{
float:left;
@media (max-device-width:480px), screen and (max-width:800px){
float:none
}
}
}
// hp CSS
@ -261,5 +266,10 @@
}
.interior .header-Nav{
padding-left:70px
padding-left:70px;
@media (max-device-width:480px), screen and (max-width:800px){
width:100%;
}
}
.interior .constant-Nav{margin:0}

View file

@ -934,7 +934,7 @@ a {
.header-Base {
background: #65a0ad;
border-bottom: 6px solid #e93250;
min-height: 47px;
min-height: 42px;
overflow: hidden; }
@media (max-device-width: 480px), screen and (max-width: 800px) {
@ -1083,11 +1083,14 @@ a {
.status-Nav {
float: right; }
.status-Nav li {
float: left; }
@media (max-device-width: 480px), screen and (max-width: 800px) {
.status-Nav {
float: none; } }
.status-Nav li {
float: left; }
@media (max-device-width: 480px), screen and (max-width: 800px) {
.status-Nav li {
float: none; } }
.hp .header-Base {
padding-top: 46px; }
@ -1156,6 +1159,12 @@ a {
.interior .header-Nav {
padding-left: 70px; }
@media (max-device-width: 480px), screen and (max-width: 800px) {
.interior .header-Nav {
width: 100%; } }
.interior .constant-Nav {
margin: 0; }
.content-Base {
background: #f6f0e6;

File diff suppressed because one or more lines are too long

View file

@ -9,97 +9,98 @@ javascript:
$('#deleteFilenameForm').submit();
}
.row
.span5.offset1
h1 Your home page
- current_site.file_list.each do |file|
.content-Base
.row.content
.col.col-60
h1 Your Website
- current_site.file_list.each do |file|
.row
.span4
- if file.ext == 'html' || file.ext == 'htm' || file.ext == 'txt' || file.ext == 'js' || file.ext == 'css' || file.ext == 'md'
span
<i class="icon-file-alt icon-3x"></i>&nbsp;&nbsp; <span style="font-size: 20pt">#{file.filename}</span>
- if file.filename == 'index.html'
p
| This is your index file! It is the "default file" that loads when you go to <a href="http://#{current_site.username}.neocities.org">#{current_site.username}.neocities.org</a>. In effect, it's your front page. If you want to change your front page, you need to edit (or overwrite) this file. The default file is always named <b>index.html</b>.<br><br>
div style="margin-bottom: 30px"
span
i class="icon-globe" &nbsp;&nbsp;
a href="http://#{current_site.username}.neocities.org/#{file.filename}" target="_blank" View <br>
span
i class="icon-edit" &nbsp;&nbsp;
a href="/site_files/text_editor/#{file.filename}" Edit with text editor <br>
span
i class="icon-edit" &nbsp;&nbsp;
span Edit with visual editor <small>(coming soon)</small> <br>
span
i class="icon-edit" &nbsp;&nbsp;
span: a href="/site_files/download/#{file.filename}" Download <br>
span
i class="icon-trash" &nbsp;&nbsp;
a href="#" onclick="confirmFileDelete('#{file.filename}')" Delete
- else
<i class="icon-picture icon-3x"></i>&nbsp;&nbsp; <font style="font-size: 20pt">#{file.filename}</font>
div style="margin-top: 3px; margin-bottom: 30px"
| To use in an HTML file, paste this text: <code><small>&lt;img src="/#{file.filename}"&gt;</small></code>
<br>
a href="http://#{current_site.username}.neocities.org/#{file.filename}" target="_blank" View <br>
a href="#" onclick="confirmFileDelete('#{file.filename}')" Delete
.col.col-40
.row
.span4
- if file.ext == 'html' || file.ext == 'htm' || file.ext == 'txt' || file.ext == 'js' || file.ext == 'css' || file.ext == 'md'
span
<i class="icon-file-alt icon-3x"></i>&nbsp;&nbsp; <span style="font-size: 20pt">#{file.filename}</span>
- if file.filename == 'index.html'
p
| This is your index file! It is the "default file" that loads when you go to <a href="http://#{current_site.username}.neocities.org">#{current_site.username}.neocities.org</a>. In effect, it's your front page. If you want to change your front page, you need to edit (or overwrite) this file. The default file is always named <b>index.html</b>.<br><br>
div style="margin-bottom: 30px"
span
i class="icon-globe" &nbsp;&nbsp;
a href="http://#{current_site.username}.neocities.org/#{file.filename}" target="_blank" View <br>
span
i class="icon-edit" &nbsp;&nbsp;
a href="/site_files/text_editor/#{file.filename}" Edit with text editor <br>
span
i class="icon-edit" &nbsp;&nbsp;
span Edit with visual editor <small>(coming soon)</small> <br>
span
i class="icon-edit" &nbsp;&nbsp;
span: a href="/site_files/download/#{file.filename}" Download <br>
span
i class="icon-trash" &nbsp;&nbsp;
a href="#" onclick="confirmFileDelete('#{file.filename}')" Delete
- else
<i class="icon-picture icon-3x"></i>&nbsp;&nbsp; <font style="font-size: 20pt">#{file.filename}</font>
div style="margin-top: 3px; margin-bottom: 30px"
| To use in an HTML file, paste this text: <code><small>&lt;img src="/#{file.filename}"&gt;</small></code>
<br>
a href="http://#{current_site.username}.neocities.org/#{file.filename}" target="_blank" View <br>
a href="#" onclick="confirmFileDelete('#{file.filename}')" Delete
.span5
.row
.span5
a href="http://#{current_site.username}.neocities.org" target="_blank": img src="/site_screenshots/#{current_site.username}.jpg"
h3 style="color: green": a href="http://#{current_site.username}.neocities.org" target="_blank" http://#{current_site.username}.neocities.org
br
.progress.progress-info.progress-striped
.bar style="width: #{(current_site.total_space / Site::MAX_SPACE.to_f) * 100}%"
h4 You are currently using #{((current_site.total_space.to_f / Site::MAX_SPACE) * 100).round(1)}% (#{(current_site.total_space.to_f / 2**20).round(2)}MB) of your #{(Site::MAX_SPACE.to_f / 2**20).to_i}MB of free space.
.row style="margin-top: 20px"
.span5
div
a href="/site_files/new" class="btn-Action" style="margin-bottom:20px" Upload New File
div
a href="/site_files/new_page" class="btn-Action" style="margin-bottom: 20px" Create New HTML Page
h4: a href="/site_files/#{current_site.username}.zip" Download Entire Site
.row style="margin-top: 20px"
.span5
<i class="icon-question-sign icon-3x"></i>&nbsp;&nbsp; <span style="font-size: 20pt">Need to learn web design?</span>
div
.span5
a href="http://#{current_site.username}.neocities.org" target="_blank": img src="/site_screenshots/#{current_site.username}.jpg"
h3 class="eps": a href="http://#{current_site.username}.neocities.org" target="_blank" http://#{current_site.username}.neocities.org
br
.progress.progress-info.progress-striped
.bar style="width: #{(current_site.total_space / Site::MAX_SPACE.to_f) * 100}%"
h4 class="base": You are currently using #{((current_site.total_space.to_f / Site::MAX_SPACE) * 100).round(1)}% (#{(current_site.total_space.to_f / 2**20).round(2)}MB) of your #{(Site::MAX_SPACE.to_f / 2**20).to_i}MB of free space.
.row style="margin-top: 20px"
.span5
div
i class="icon-globe" &nbsp;&nbsp;
a href="http://www.htmldog.com/guides/html/beginner" target="_blank" HTML Beginner Tutorial
a href="/site_files/new" class="btn-Action" style="margin-bottom:20px" Upload New File
div
i class="icon-globe" &nbsp;&nbsp;
a href="http://www.w3schools.com/html/html_intro.asp" target="_blank" w3schools HTML introduction
a href="/site_files/new_page" class="btn-Action" style="margin-bottom: 20px" Create New HTML Page
h4: a href="/site_files/#{current_site.username}.zip" Download Entire Site
.row style="margin-top: 20px"
.span5
<i class="icon-question-sign icon-3x"></i>&nbsp;&nbsp; <span style="font-size: 20pt">Need to learn web design?</span>
div
i class="icon-globe" &nbsp;&nbsp;
a href="http://codepupil.com/" target="_blank" CodePupil.com teaches with games<br>
div
i class="icon-globe" &nbsp;&nbsp;
a href="http://www.codecademy.com/tracks/web" target="_blank" Online lessons at Codecademy.com<br>
form method="POST" action="/site_files/delete" id="deleteFilenameForm"
input name="csrf_token" type="hidden" value="#{csrf_token}"
input type="hidden" id="deleteFilenameInput" name="filename"
.modal.hide.fade id="deleteConfirmModal" tabindex="-1" role="dialog" aria-labelledby="deleteConfirmModalLabel" aria-hidden="true"
.modal-header
button.close type="button" data-dismiss="modal" aria-hidden="true" x
h3 id="deleteConfirmModalLabel" Confirm delete of file
.modal-body
p You are about to delete the file <span id="deleteFileName"></span>. Are you sure?
.modal-footer
button.btn data-dismiss="modal" aria-hidden="true" Cancel
button.btn.btn-danger onclick="fileDelete()" Delete
div
i class="icon-globe" &nbsp;&nbsp;
a href="http://www.htmldog.com/guides/html/beginner" target="_blank" HTML Beginner Tutorial
div
i class="icon-globe" &nbsp;&nbsp;
a href="http://www.w3schools.com/html/html_intro.asp" target="_blank" w3schools HTML introduction
div
i class="icon-globe" &nbsp;&nbsp;
a href="http://codepupil.com/" target="_blank" CodePupil.com teaches with games<br>
div
i class="icon-globe" &nbsp;&nbsp;
a href="http://www.codecademy.com/tracks/web" target="_blank" Online lessons at Codecademy.com<br>
form method="POST" action="/site_files/delete" id="deleteFilenameForm"
input name="csrf_token" type="hidden" value="#{csrf_token}"
input type="hidden" id="deleteFilenameInput" name="filename"
.modal.hide.fade id="deleteConfirmModal" tabindex="-1" role="dialog" aria-labelledby="deleteConfirmModalLabel" aria-hidden="true"
.modal-header
button.close type="button" data-dismiss="modal" aria-hidden="true" x
h3 id="deleteConfirmModalLabel" Confirm delete of file
.modal-body
p You are about to delete the file <span id="deleteFileName"></span>. Are you sure?
.modal-footer
button.btn data-dismiss="modal" aria-hidden="true" Cancel
button.btn.btn-danger onclick="fileDelete()" Delete

View file

@ -14,7 +14,7 @@ html
link href="/assets/css/neo.min.css" rel="stylesheet" type="text/css" media="all"
script src="/assets/scripts/nav.min.js"
body
body.interior
a id="top"
== erb :'_header', layout: false

View file

@ -11,69 +11,70 @@ javascript:
- @site.errors.each do |error|
p = error.last.first
.row
.span8.offset3
form method="POST" action="/create"
input name="csrf_token" type="hidden" value="#{csrf_token}"
h2 Create a new Home Page
.row
.span6
p First, enter a username. This will also be used as your site path.<br><b>Do not forget this, it will be used to sign in to and manage your home page.</b><br>It cannot contain spaces, and can only use the following characters: a-z A-Z 0-9 _ -
.row
.span1
h5 Username
.span6
p <input name="username" type="text" placeholder="yourusername" value="#{@site.username}" autocapitalize="off" autocorrect="off">.neocities.org
.row
.span6
p Next, enter a password. This will be used to allow you to login. Minimum 5 characters. If you don't make it a good password, Dade Murphy from the movie Hackers will come in and steal your "garbage files".
.page
.row.content
.span8.offset3
form method="POST" action="/create"
input name="csrf_token" type="hidden" value="#{csrf_token}"
h2 Create a new Home Page
.row
.span1
h5 Password
.span6
input name="password" type="password"
.row
.span6
p Now you can enter an e-mail address. Your e-mail address is private and we will not show it to anyone for any reason. You don't have to provide one, but <b>we will not be able to reset your password without it, so don't lose your username and password if you leave this blank!</b>
.row
.span1
h5 Email
.span6
input name="email" type="email" placeholder="youremail@example.com" value="#{@site.email}"
.row
.span6
p First, enter a username. This will also be used as your site path.<br><b>Do not forget this, it will be used to sign in to and manage your home page.</b><br>It cannot contain spaces, and can only use the following characters: a-z A-Z 0-9 _ -
.row
.span1
h5 Username
.span6
p <input name="username" type="text" placeholder="yourusername" value="#{@site.username}" autocapitalize="off" autocorrect="off">.neocities.org
.row
.span6
p Next, enter a password. This will be used to allow you to login. Minimum 5 characters. If you don't make it a good password, Dade Murphy from the movie Hackers will come in and steal your "garbage files".
.row
.span6
p
| You can optionally enter some tags! Tags will allow others to find your site based on your interests, or your site's theme. <b>Separate multiple tags with commas</b>. Don't think too hard about this, you can change them later. You can have a maximum of ten tags, and there is a two word per tag maximum (extra words in a tag will be removed).
.row
.span1
h5 Tags
.span6
p: input name="tags" type="text" style="width: 400px" placeholder="pokemon, video games, bulbasaur" value="#{params[:tags]}" autocapitalize="off" autocorrect="off"
.row
.span6
input name="is_nsfw" type="hidden" value="false"
p: strong If your page will contain objectionable (adult) content, check this box:&nbsp;&nbsp;&nbsp;<input name="is_nsfw" type="checkbox" value="true" style="margin-top: 0px">
.row
.span6
p Last thing! Enter these two words correctly (with spaces) so we know you're not a robot (don't worry robots, we still love you).
div
== recaptcha_tag :challenge, ssl: true
.row
.span6
h3 You're done. Just click the button below!
.row style="margin-top: 10px"
.span3.offset1
input.btn.btn-success.btn-large type="submit" value="Create Home Page"
.row
.span1
h5 Password
.span6
input name="password" type="password"
.row
.span6
p Now you can enter an e-mail address. Your e-mail address is private and we will not show it to anyone for any reason. You don't have to provide one, but <b>we will not be able to reset your password without it, so don't lose your username and password if you leave this blank!</b>
.row
.span1
h5 Email
.span6
input name="email" type="email" placeholder="youremail@example.com" value="#{@site.email}"
.row
.span6
p
| You can optionally enter some tags! Tags will allow others to find your site based on your interests, or your site's theme. <b>Separate multiple tags with commas</b>. Don't think too hard about this, you can change them later. You can have a maximum of ten tags, and there is a two word per tag maximum (extra words in a tag will be removed).
.row
.span1
h5 Tags
.span6
p: input name="tags" type="text" style="width: 400px" placeholder="pokemon, video games, bulbasaur" value="#{params[:tags]}" autocapitalize="off" autocorrect="off"
.row
.span6
input name="is_nsfw" type="hidden" value="false"
p: strong If your page will contain objectionable (adult) content, check this box:&nbsp;&nbsp;&nbsp;<input name="is_nsfw" type="checkbox" value="true" style="margin-top: 0px">
.row
.span6
p Last thing! Enter these two words correctly (with spaces) so we know you're not a robot (don't worry robots, we still love you).
div
== recaptcha_tag :challenge, ssl: true
.row
.span6
h3 You're done. Just click the button below!
.row style="margin-top: 10px"
.span3.offset1
input.btn-Action type="submit" value="Create Home Page"

View file

@ -1,58 +1,59 @@
.row
.span12.text-center
h1 Site Settings
.row
.span12.text-center
- if !current_site.errors.empty?
.row
.span8.offset2
.alert.alert-block.alert-error
- current_site.errors.each do |error|
p = error.last.first
.row
.span4
h2 Change Password
form method="POST" action="/change_password"
input name="csrf_token" type="hidden" value="#{csrf_token}"
.page
.row.content
.span12.text-center
h1 Site Settings
.row
.span12.text-center
- if !current_site.errors.empty?
.row
.span8.offset2
.alert.alert-block.alert-error
- current_site.errors.each do |error|
p = error.last.first
.row
.span4
h2 Change Password
form method="POST" action="/change_password"
input name="csrf_token" type="hidden" value="#{csrf_token}"
div
p Current Password:
input name="current_password" type="password"
div
p New Password:
input name="new_password" type="password"
div
p Confirm New Password:
input name="new_password_confirm" type="password"
input.btn-Action type="submit" value="Change Password"
.span4
h2 Change Site (User) Name
div
p Current Password:
input name="current_password" type="password"
form method="POST" action="/change_name"
input name="csrf_token" type="hidden" value="#{csrf_token}"
p It cannot contain spaces, and can only use the following characters: a-z A-Z 0-9 _ -
div
p New Password:
input name="new_password" type="password"
div
p Current name: <span style="color: green"><strong>#{current_site.username}</strong></span>
div
p New name:
input name="name" type="text" placeholder="newname"
div
input.btn-Action type="submit" value="Change Name"
.span4
h2 Mark Adult Content
p If your site contains objectionable (adult) content, check this box. Your site will not be removed, but it will be listed on a special browse page. We don't have an official policy on what defines "adult" content yet, we are still working on this. In the interim, best guesses. Thanks for your patience as we try to find a way to balance out the needs of everyone.
form method="POST" action="/change_nsfw"
input name="csrf_token" type="hidden" value="#{csrf_token}"
input name="is_nsfw" type="hidden" value="false"
p: strong My page contains objectionable (adult) content:&nbsp;&nbsp;&nbsp;<input name="is_nsfw" type="checkbox" value="true" style="margin-top: 0px" #{"checked" if current_site.is_nsfw}>
div
p Confirm New Password:
input name="new_password_confirm" type="password"
input.btn.btn-success type="submit" value="Change Password"
.span4
h2 Change Site (User) Name
form method="POST" action="/change_name"
input name="csrf_token" type="hidden" value="#{csrf_token}"
p It cannot contain spaces, and can only use the following characters: a-z A-Z 0-9 _ -
div
p Current name: <span style="color: green"><strong>#{current_site.username}</strong></span>
div
p New name:
input name="name" type="text" placeholder="newname"
div
input.btn.btn-success type="submit" value="Change Name"
.span4
h2 Mark Adult Content
p If your site contains objectionable (adult) content, check this box. Your site will not be removed, but it will be listed on a special browse page. We don't have an official policy on what defines "adult" content yet, we are still working on this. In the interim, best guesses. Thanks for your patience as we try to find a way to balance out the needs of everyone.
form method="POST" action="/change_nsfw"
input name="csrf_token" type="hidden" value="#{csrf_token}"
input name="is_nsfw" type="hidden" value="false"
p: strong My page contains objectionable (adult) content:&nbsp;&nbsp;&nbsp;<input name="is_nsfw" type="checkbox" value="true" style="margin-top: 0px" #{"checked" if current_site.is_nsfw}>
input.btn.btn-success type="submit" value="Update"
input.btn-Action type="submit" value="Update"

View file

@ -1,16 +1,15 @@
.text-center
.row
.span12
h1 Welcome back!
.row
.span12
form method="POST" action="/signin"
.page
.content.single-Col
h1 Welcome back!
form method="POST" action="/signin"
input name="csrf_token" type="hidden" value="#{csrf_token}"
fieldset
div: input name="username" type="text" placeholder="Your username" autocapitalize="off" autocorrect="off"
div: input name="password" type="password" placeholder="Your password"
div: button class="btn btn-large btn-success" href="#" style="margin-top: 10px" Sign in
div: input name="username" type="text" placeholder="Your username" class="input-Area" autocapitalize="off" autocorrect="off"
div: input name="password" type="password" class="input-Area" placeholder="Your password"
div: button class="btn-Action" href="#" Sign in
.row
.span12
div