zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-05-15 00:47:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

HTML / layout clean ups

Browse source 
update to HTML of new_page.slim.  remove bootstrap code in favor of bass-tacks

small updates to error page html

update not found page to reflect style of rest of the website

dashboard clean up. remove needless twitter divs
update visual of top right screenshot/web address area

small clean ups to text editor.
This commit is contained in:
Scott O'Hara 2013-07-27 09:07:25 -04:00
parent dd5189ab8c
commit 02a915bc83
5 changed files with 95 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

104
views/dashboard.slim
View file

@ -16,73 +16,65 @@ javascript:
h1 Your Website h1 Your Website
- current_site.file_list.each do |file| - current_site.file_list.each do |file|
.row - if file.ext == 'html' || file.ext == 'htm' || file.ext == 'txt' || file.ext == 'js' || file.ext == 'css' || file.ext == 'md'
.span4 span
- if file.ext == 'html' || file.ext == 'htm' || file.ext == 'txt' || file.ext == 'js' || file.ext == 'css' || file.ext == 'md' <i class="icon-file-alt icon-3x"></i>&nbsp;&nbsp; <span style="font-size: 20pt">#{file.filename}</span>
span - if file.filename == 'index.html'
<i class="icon-file-alt icon-3x"></i>&nbsp;&nbsp; <span style="font-size: 20pt">#{file.filename}</span> p.tiny
- if file.filename == 'index.html' 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>.
p.tiny
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>.
div style="margin-bottom:30px" div style="margin-bottom:30px"
span span
i class="icon-globe" &nbsp;&nbsp; i class="icon-globe" &nbsp;&nbsp;
a href="http://#{current_site.username}.neocities.org/#{file.filename}" target="_blank" View <br />
a href="http://#{current_site.username}.neocities.org/#{file.filename}" target="_blank" View <br /> span
span i class="icon-edit" &nbsp;&nbsp;
i class="icon-edit" &nbsp;&nbsp; a href="/site_files/text_editor/#{file.filename}" Edit with text editor <br />
a href="/site_files/text_editor/#{file.filename}" Edit with text editor <br /> span
span i class="icon-edit" &nbsp;&nbsp;
i class="icon-edit" &nbsp;&nbsp; span Edit with visual editor <small style="margin:0; display:inline">(coming soon)</small><br/>
span Edit with visual editor <small style="margin:0; display:inline">(coming soon)</small><br/> span
span i class="icon-edit" &nbsp;&nbsp;
i class="icon-edit" &nbsp;&nbsp; span: a href="/site_files/download/#{file.filename}" Download <br />
span: a href="/site_files/download/#{file.filename}" Download <br /> span
span i class="icon-trash" &nbsp;&nbsp;
i class="icon-trash" &nbsp;&nbsp; a href="#" onclick="confirmFileDelete('#{file.filename}')" Delete
a href="#" onclick="confirmFileDelete('#{file.filename}')" Delete - else
- else <i class="icon-picture icon-3x"></i>&nbsp;&nbsp; <span style="font-size: 20pt">#{file.filename}</span>
<i class="icon-picture icon-3x"></i>&nbsp;&nbsp; <span style="font-size: 20pt">#{file.filename}</span> div style="margin-top: 3px; margin-bottom:10px"
div style="margin-top: 3px; margin-bottom:10px" | To use in an HTML file, paste this text: <code class="tiny" style="margin:0">&lt;img src="/#{file.filename}"&gt;</code>
| To use in an HTML file, paste this text: <code class="tiny" style="margin:0">&lt;img src="/#{file.filename}"&gt;</code> a href="http://#{current_site.username}.neocities.org/#{file.filename}" target="_blank" View <br />
a href="http://#{current_site.username}.neocities.org/#{file.filename}" target="_blank" View <br /> a href="#" onclick="confirmFileDelete('#{file.filename}')" Delete
a href="#" onclick="confirmFileDelete('#{file.filename}')" Delete
.col.col-40 .col.col-40
.row div.txt-Center style="border:1px solid #ccc; background:#rgba(255,255,255,.7); padding:1em; margin-bottom:20px"
.span5 a href="http://#{current_site.username}.neocities.org" style="display:block" target="_blank": img src="/site_screenshots/#{current_site.username}.jpg" alt="screen shot"
br
h3 class="base" style="line-height:1": a href="http://#{current_site.username}.neocities.org" target="_blank" http://#{current_site.username}.neocities.org
a href="/site_files/#{current_site.username}.zip" class="btn-Action" Download Entire Site
a href="http://#{current_site.username}.neocities.org" target="_blank": img src="/site_screenshots/#{current_site.username}.jpg" alt="screen shot" .progress.progress-info.progress-striped
.bar style="width: #{(current_site.total_space / Site::MAX_SPACE.to_f) * 100}%"
h3 class="eps": a href="http://#{current_site.username}.neocities.org" target="_blank" http://#{current_site.username}.neocities.org h4.base.txt-Center
br You are currently using #{((current_site.total_space.to_f / Site::MAX_SPACE) * 100).round(1)}% (#{current_site.total_space_in_megabytes}MB) of your #{(Site::MAX_SPACE.to_f / 2**20).to_i}MB of free space.
.progress.progress-info.progress-striped
.bar style="width: #{(current_site.total_space / Site::MAX_SPACE.to_f) * 100}%"
h4.base div.txt-Center
You are currently using #{((current_site.total_space.to_f / Site::MAX_SPACE) * 100).round(1)}% (#{current_site.total_space_in_megabytes}MB) of your #{(Site::MAX_SPACE.to_f / 2**20).to_i}MB of free space. a href="/site_files/upload" class="btn-Action" style="margin-bottom:20px" Upload New Files
a href="/site_files/new_page" class="btn-Action" Create New HTML Page
hr
div
<i class="icon-question-sign icon-3x"></i>&nbsp;&nbsp; <span style="font-size: 20pt">Need to learn web design?</span>
i class="icon-globe" &nbsp;&nbsp;
a href="/tutorials" target="_blank" Web Design, HTML, CSS, JavaScript Tutorials
.row style="margin-top: 20px"
.span5
div
a href="/site_files/upload" class="btn-Action" style="margin-bottom:20px" Upload New Files
div
a href="/site_files/new_page" class="btn-Action" Create New HTML Page
<hr />
div
a href="/site_files/#{current_site.username}.zip" class="btn-Action" 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
div
i class="icon-globe" &nbsp;&nbsp;
a href="/tutorials" target="_blank" Web Design, HTML, CSS, JavaScript Tutorials
form method="POST" action="/site_files/delete" id="deleteFilenameForm" form method="POST" action="/site_files/delete" id="deleteFilenameForm"
input name="csrf_token" type="hidden" value="#{csrf_token}" input name="csrf_token" type="hidden" value="#{csrf_token}"

5
views/error.slim
View file

@ -1,7 +1,8 @@
.page .page
.content-Base.txt-Center .content-Base.txt-Center.col-60 style="margin:0 auto"
h2 Site Error h2 Site Error
p.eps There has been an error performing the requested action. p.eps There has been an error performing the requested action.
<br /> <br />
br
h4 We have been notified of the problem. h4 We have been notified of the problem.
p If you need to add any special information or if this error has not been resolved in a while, <a href="/contact" title="let us know!">contact us</a> and report the problem. Thank you! p.tiny If you need to add any special information or if this error has not been resolved in a while, <a href="/contact" title="let us know!">contact us</a> and report the problem. Thank you!

13
views/not_found.slim
View file

@ -1,7 +1,10 @@
.row .page
.span8.offset2.text-center .content-Base.txt-Center.col-60 style="margin:0 auto"
h2 Not Found h2 Not Found
h4 We could not find the requested page. Our apologies. br
h5 It you believe this to be in error, please <a href="/contact">contact us</a> and report the problem. Thank you! h4 Sorry but we could not find the requested page.
p It you believe this to be in error, please <a href="/contact" title="get in touch with us">contact us</a> and report the problem. Thank you!
- if request.referer - if request.referer
a href="#{request.referer}" Go Back
a class="btn-Action" href="#{request.referer}" Go Back

36
views/site_files/new_page.slim
View file

@ -1,23 +1,23 @@
.content-Base .content-Base
.content
- if @errors - if @errors
div.alert.alert-error div.alert.alert-error
h3 There were errors, please correct: h3 There were errors, please correct:
- @errors.each do |error| - @errors.each do |error|
h5 = error h5 = error
h1.txt-Center Create new HTML page h1.txt-Center.beta Create new HTML page
<br /> .txt-Center
.txt-Center form method="POST" action="/site_files/create_page" enctype="multipart/form-data"
form method="POST" action="/site_files/create_page" enctype="multipart/form-data" input name="csrf_token" type="hidden" value="#{csrf_token}"
input name="csrf_token" type="hidden" value="#{csrf_token}" p.eps What's the name of your page?
p.eps What's the name of your page? p.eps: input type="text" name="pagefilename" autocapitalize="off" autocorrect="off".html
p.eps: input type="text" name="pagefilename" autocapitalize="off" autocorrect="off".html p: input.btn-Action type="submit" value="Create Page"
p: input.btn-Action type="submit" value="Create Page"
.row .row style="padding-top:30px"
.span6.offset3 .col.col-40 style="float:none; margin:0 auto;"
p.eps Note: We will automatically scrub any characters not matching: a-z A-Z 0-9 _ - . p.eps Note: We will automatically scrub any characters not matching: a-z A-Z 0-9 _ - .
p.zeta Page must not already exist. p.zeta Page must not already exist.
p.zeta If you want to make this the index page (and an index page doesn't exist), name it <strong>index.html</strong>. p.zeta If you want to make this the index page (and an index page doesn't exist), name it <strong>index.html</strong>.

16
views/site_files/text_editor.slim
View file

@ -17,7 +17,7 @@ css:
h2 Editing #{params[:filename]} h2 Editing #{params[:filename]}
div.theme-Code .theme-Code
p style="display:inline-block; margin-right:10px" Theme: p style="display:inline-block; margin-right:10px" Theme:
select id="theme" size="1" onchange="setTheme();" onkeyup="setTheme();" select id="theme" size="1" onchange="setTheme();" onkeyup="setTheme();"
optgroup label="Bright" optgroup label="Bright"
@ -53,17 +53,17 @@ css:
option value="ace/theme/twilight" Twilight option value="ace/theme/twilight" Twilight
option value="ace/theme/vibrant_ink" Vibrant Ink option value="ace/theme/vibrant_ink" Vibrant Ink
.row div id="editor" style="width: 100%; height: 600px; position: relative; margin-bottom:25px"
.span12 == encoding_fix @file_data
div id="editor" style="width: 100%; height: 600px; position: relative;"
== encoding_fix @file_data
.row .row
.col.col-33.txt-Center .col.col-33.txt-Center style="margin-bottom:10px"
a.btn-Action href="/dashboard" <i class="icon-remove"></i>&nbsp;&nbsp;Finish Without Saving a.btn-Action href="/dashboard" <i class="icon-remove"></i>&nbsp;&nbsp;Finish Without Saving
.col.col-33.txt-Center
.col.col-33.txt-Center style="margin-bottom:10px"
a.btn-Action href="#" onclick="saveTextFile(false); return false" <i class="icon-save"></i>&nbsp;&nbsp;Save Changes a.btn-Action href="#" onclick="saveTextFile(false); return false" <i class="icon-save"></i>&nbsp;&nbsp;Save Changes
.col.col-33.txt-Center .col.col-33.txt-Center
a.btn-Action href="#" onclick="saveTextFile(true); return false" <i class="icon-save"></i>&nbsp;&nbsp;Save and Finish a.btn-Action href="#" onclick="saveTextFile(true); return false" <i class="icon-save"></i>&nbsp;&nbsp;Save and Finish
@ -100,7 +100,7 @@ css:
if(quit === true) { if(quit === true) {
window.location = '/dashboard'; window.location = '/dashboard';
} }
$('#editorUpdates span').html('<i class="icon-save icon-2x"></i>&nbsp;&nbsp;<font style="font-size: 14pt">Your file has been saved.</font>'); $('#editorUpdates span').html('<i class="icon-save icon-2x"></i>&nbsp;&nbsp;<span style="font-size: 14pt">Your file has been saved.</span>');
setTimeout(function() { setTimeout(function() {
$('#editorUpdates').fadeOut(); //.addClass('hidden'); $('#editorUpdates').fadeOut(); //.addClass('hidden');
}, 2000); }, 2000);