v50 Steam/Premium information for editors
  • v50 information can now be added to pages in the main namespace. v0.47 information can still be found in the DF2014 namespace. See here for more details on the new versioning policy.
  • Use this page to report any issues related to the migration.
This notice may be cached—the current version can be found here.

Editing Dwarf Fortress Wiki:Magmawiki

Jump to navigation Jump to search

Warning: You are not logged in.
Your IP address will be recorded in this page's edit history.


The edit can be undone. Please check the comparison below to verify that this is what you want to do, and then save the changes below to finish undoing the edit.

Latest revision Your text
Line 5: Line 5:
 
Source code is hosted on [http://www.github.com/locriani/magmawiki Github].
 
Source code is hosted on [http://www.github.com/locriani/magmawiki Github].
  
IRC channel for '''software development''' ('''[[IRC|NOT dwarf fortress questions / discussions, check here for those channels!]]''') is [http://irc.freenode.org/#magmawiki #magmawiki on freenode.org]
 
 
Discussion of the magmawiki project on the forums is [http://www.bay12forums.com/smf/index.php?topic=55613.0 here]
 
 
== Versioning ==
 
== Versioning ==
 
{| style='width: 35em; margin: 1em auto; border-spacing: 0; text-align: center'
 
{| style='width: 35em; margin: 1em auto; border-spacing: 0; text-align: center'
Line 16: Line 13:
 
| colspan='2' width='1%' style='font-size: 200%; padding: 0.2em; border-bottom: 3px solid #9df; background: #eef5ff' | 0
 
| colspan='2' width='1%' style='font-size: 200%; padding: 0.2em; border-bottom: 3px solid #9df; background: #eef5ff' | 0
 
| colspan='2' width='1%' style='font-size: 200%; padding: 0' | .
 
| colspan='2' width='1%' style='font-size: 200%; padding: 0' | .
| colspan='2' width='1%' style='font-size: 200%; padding: 0.2em; border-bottom: 3px solid #db8; background: #fff5ee' | 17
+
| colspan='2' width='1%' style='font-size: 200%; padding: 0.2em; border-bottom: 3px solid #db8; background: #fff5ee' | 12
 
| colspan='2' width='1%' style='font-size: 200%; padding: 0' | .
 
| colspan='2' width='1%' style='font-size: 200%; padding: 0' | .
 
| colspan='2' width='1%' style='font-size: 200%; padding: 0.2em; border-bottom: 3px solid #bd8; background: #f5ffee' | 0
 
| colspan='2' width='1%' style='font-size: 200%; padding: 0.2em; border-bottom: 3px solid #bd8; background: #f5ffee' | 0
 
| colspan='1' width='1%' style='font-size: 200%; padding: 0' | .
 
| colspan='1' width='1%' style='font-size: 200%; padding: 0' | .
| colspan='2' width='1%' style='font-size: 200%; padding: 0.2em; border-bottom: 3px solid #999; background: #eeeeee' | 246
+
| colspan='2' width='1%' style='font-size: 200%; padding: 0.2em; border-bottom: 3px solid #999; background: #eeeeee' | 146
 
| colspan='4' |
 
| colspan='4' |
 
|-
 
|-
Line 85: Line 82:
 
| colspan='2' style='padding: 0.25em; border: 2px solid #999; background: #eeeeee' | Number of expletives uttered during development.  
 
| colspan='2' style='padding: 0.25em; border: 2px solid #999; background: #eeeeee' | Number of expletives uttered during development.  
 
|}
 
|}
 
== Conceptual screenshots / sketches ==
 
[[File:Screen_shot_2010-05-11_at_5.08.20_PM.png]] loginbox design (modal dialogs)
 
THE FONT SIZE IS BUGGING ME AUGH THE PAIN
 
  
 
==Planned Versions ==
 
==Planned Versions ==
 
=== Version 0.1 Features ===
 
=== Version 0.1 Features ===
{{progress_bar|17|total=34}}
+
{{progress_bar|12|total=31}}
 
*Header
 
*Header
 
**Tabs
 
**Tabs
Line 105: Line 98:
 
**Actions
 
**Actions
 
***<s>Create (New)</s>
 
***<s>Create (New)</s>
***<s>Read (Show)</s>
+
***Read (Show)
****<s>Parser (Mediawiki)</s>
+
****Parser (Mediawiki)
*****<s>Article Links</s>
+
*****Article Links
 
***<s>Update (Edit)</s>
 
***<s>Update (Edit)</s>
 +
***Delete
 
**<s>Named URIs (slugs)</s>
 
**<s>Named URIs (slugs)</s>
 
***<s>Immutable until page move (NYI)</s>
 
***<s>Immutable until page move (NYI)</s>
Line 119: Line 113:
 
*Users
 
*Users
 
**<s>Account creation</s>
 
**<s>Account creation</s>
**<s>Login / Logout (sessions)</s>
+
**Login / Logout (sessions)
 
**Account management
 
**Account management
***<s>Localization options</s>
 
***Change password
 
***Change email
 
 
**IP Tracking
 
**IP Tracking
**Revision / Article edit tied to user
 
 
*<s>Localization backend stuff</s>
 
*<s>Localization backend stuff</s>
  
Line 131: Line 121:
 
{{progress_bar|0|total=1}}
 
{{progress_bar|0|total=1}}
 
*Articles
 
*Articles
**Actions
 
***Delete
 
 
**Optimistic Locking Merges (<s>I don't remember what I meant by this</s> page merge screen for changes when changes are blocked by optimistic locking)
 
**Optimistic Locking Merges (<s>I don't remember what I meant by this</s> page merge screen for changes when changes are blocked by optimistic locking)
 
**Page moves
 
**Page moves
Line 163: Line 151:
 
***Sandbox merging
 
***Sandbox merging
 
== Points of discussion ==
 
== Points of discussion ==
*Mass deletion of a users contribs (perhaps ranges and checkbox methods?)
 
*Talk forums -- see [[DF: Magmawiki/Emmys Talk Forum Mockup|this page]]
 
 
*Article ratings
 
*Article ratings
 
*Line / Word comments (post it notes / discussion thread reference points?)
 
*Line / Word comments (post it notes / discussion thread reference points?)
 
*Alternative url implementations (RESTful state w/o /[new, edit, create, etc])
 
*Alternative url implementations (RESTful state w/o /[new, edit, create, etc])
*Side by side rendering
 
<pre>
 
[09:17am] epitron: side-by-side markup/rendered-html
 
[09:17am] epitron: you click "preview" and it re-renders it
 
[09:18am] epitron: and if you scroll, it scrolls both windows in synch
 
[09:18am] epitron: like the way MELD does
 
[09:18am] locriani: that's good
 
[09:18am] epitron: the preview will scroll a lot less sometimes
 
[09:18am] epitron: like for your version number table monstrousity
 
[09:18am] locriani: and the cursor position in the markup window
 
[09:18am] locriani: or in the html window
 
[09:18am] locriani: will highlight the appropriate element in the other window
 
[09:18am] epitron: yeah!
 
[09:18am] epitron: cursor position would be harder
 
[09:18am] epitron: but it would be slick
 
</pre>
 
*AUGH PASSWORDS (Mediawiki: <code>":B:"+ salt (31 bit, hex between 0 and 7fff ffff inclusive) + ":" + md5(salt + "-" + md5(password))</code> )
 
*file uploads, html5 display methods, etc (video, <code><canvas></code> tags, media, acceptable formats, etc)
 
*Document management stuffs
 
 
*Inline-comments
 
<pre>
 
12:00 <@epitron> i think i just solved the marking problem
 
12:01 <@epitron> 1) the match is saved as plaintext with an integer
 
12:02 <@epitron>  1.a) the integer represents which occurance of that match you've marked
 
12:02 <@epitron> 2) html can be stripped to find the same position in the markup doc
 
12:03 <@epitron> 3) to deal with new edits, the integer can increment when a diff
 
                contains the plaintext match
 
12:03 <@epitron> (a diff before the marked area)
 
12:03 <@epitron> (we can ignore diffs afterwards)
 
12:03 <@epitron> sound good?
 
12:04 <@epitron> it gets around the round-tripping problem by reducing everything to
 
                good old plaintext :D
 
12:04 <@epitron> i believe that's a reliable 1:1 mapping
 
12:05 <@epitron> just gotta normalize it by doing gsub(/\s+/, ' ')
 
13:27 <@epitron> the only piece remaining is how to persist the inline comments across
 
                revisions
 
13:28 <@epitron> the marked area will be active on a revision up until it's overwritten
 
13:29 <@epitron> (there's a little edge case where a marking is overwritten, then a
 
                few revisions down the road you revert back to an earlier copy with
 
                the marking... it should be re-connected to that document)
 
13:29 <@epitron> s/document/revision/
 
</pre>
 
 
----
 
  
 
== Considered Features ==
 
== Considered Features ==

Please note that all contributions to Dwarf Fortress Wiki are considered to be released under the GFDL & MIT (see Dwarf Fortress Wiki:Copyrights for details). If you do not want your writing to be edited mercilessly and redistributed at will, then do not submit it here.
You are also promising us that you wrote this yourself, or copied it from a public domain or similar free resource. Do not submit copyrighted work without permission!

To protect the wiki against automated edit spam, we kindly ask you to solve the following CAPTCHA:

Cancel Editing help (opens in new window)

Templates used on this page: