From 3654c805a1bf40ba567b8213b5df7f7a9559a86c Mon Sep 17 00:00:00 2001 From: Tenshi Hinanawi Date: Thu, 14 Mar 2013 22:12:22 -0700 Subject: [PATCH] fixing image links --- Home.md | 16 ++++++++-------- pages/access_keys.md | 4 ++-- pages/advanced.md | 20 ++++++++++---------- pages/changelog-parser | 11 ++++++++++- pages/db_diagrams.md | 4 ++-- pages/depots.md | 8 ++++---- pages/getting_started_files.md | 10 +++++----- pages/getting_started_messages.md | 6 +++--- pages/getting_started_ratings.md | 14 +++++++------- pages/getting_started_tags.md | 14 +++++++------- pages/help.md | 14 +++++++------- pages/introduction.md | 2 +- pages/tagging_schema.md | 10 +++++----- pages/updates.md | 20 ++++++++++---------- 14 files changed, 81 insertions(+), 72 deletions(-) diff --git a/Home.md b/Home.md index 2411d7f..ddcafc0 100644 --- a/Home.md +++ b/Home.md @@ -1,10 +1,10 @@ -[![](index-img/client_empty_small.png)](index-img/client_empty.png "the main screen, just after you start up") -[![](index-img/client_autism_small.png)](index-img/client_autism.png "an example search") -[![](index-img/lib_gc_small.png)](index-img/lib_gc.png "a well-tagged webcomic, sorted and viewed by chapter") -[![](index-img/client_fullscreen_small.png)](index-img/client_fullscreen.png "reading the webcomic in fullscreen") -[![](index-img/lib_rec_small.png)](index-img/lib_rec.png "file repository view, with some files local and some not") -[![](index-img/lib_party_hard_small.png)](index-img/lib_party_hard.png "now with swf support!") -[![](index-img/client_auto_small.png)](index-img/client_auto.png "an example of tag-autocomplete, which only displays results applicable to the current query") +[[client_empty.png|alt=the main screen, just after you start up|height=200px|width=350px]] +[[client_autism.png|alt=an example search|height=200px|width=350px]] +[[lib_gc.png|alt=a well-tagged webcomic, sorted and viewed by chapter|height=200px|width=350px]] +[[client_fullscreen.png|alt=reading the webcomic in fullscreen|height=200px|width=350px]] +[[lib_rec.png|alt=file repository view, with some files local and some not|height=200px|width=350px]] +[[lib_party_hard.png|alt=now with swf support!|height=200px|width=350px]] +[[client_auto.png|alt=an example of tag-autocomplete, which only displays results applicable to the current query|height=200px|width=350px]] ### hydrus network - client and server @@ -31,7 +31,7 @@ it is ***highly*** recommended to check out the help pages in the link below. A copy is included with the release as well. It explains the basics of the network, and how to get connected. -* [General Information/Help](help.html). +* [General Information/Help](help). * [Downloads](http://www.mediafire.com/hydrus). * [Source Code on Github](http://www.mediafire.com/hydrus). * [Support Forum](http://hydrus.x10.mx/forum/). diff --git a/pages/access_keys.md b/pages/access_keys.md index 207f536..5830a35 100644 --- a/pages/access_keys.md +++ b/pages/access_keys.md @@ -15,9 +15,9 @@ contribute|tagging_schema]] to. I also run a read-only file repository that you can search to get a feel for the interface. The files on my file repo are appropriately tagged in my tag repo. -![](img/edit_repos_public_tag_repo.png) +[[edit_repos_public_tag_repo.png]] -![](img/edit_repos_file_repo.png) +[[edit_repos_file_repo.png]] Here's the info so you can copy it: diff --git a/pages/advanced.md b/pages/advanced.md index d18abd2..6b90f8d 100644 --- a/pages/advanced.md +++ b/pages/advanced.md @@ -29,7 +29,7 @@ search. to the files you import *en masse*, and intelligently, using regexes that parse filename: -![](img/gunnerkrigg_import.png) +[[gunnerkrigg_import.png]] This should be somewhat self-explanatory to anyone familiar with regexes. I hate them, personally, but I recognise they are powerful and @@ -39,11 +39,11 @@ if you are not certain about regexes. Once you are done, you'll get something neat like this: -![](img/gunnerkrigg_page.png) +[[gunnerkrigg_page.png]] Which you can more easily manage by collecting: -![](img/gunnerkrigg_chapter.png) +[[gunnerkrigg_chapter.png]] Collections have a small icon in the bottom left corner. Selecting them actually selects many files (see the status bar), and performing an @@ -53,7 +53,7 @@ contents just like an uncollected search. Here is a particularly zoomed out view, after importing volume 2: -![](img/gunnerkrigg_volume.png) +[[gunnerkrigg_volume.png]] Importing with tags is great for long-running series with well-formatted filenames, and will save you literally hours' finicky tagging. @@ -65,11 +65,11 @@ be interested in performing a *custom filter*, which is essentially the fullscreen browser with custom shortcuts. You select it from the regular thumbnail right-click menu. First, it will show you a dialog: -![](img/custom_filter_parent.png) +[[custom_filter_parent.png]] Which has a sub-dialog to add and edit actions: -![](img/custom_filter_child.png) +[[custom_filter_child.png]] You can reassign the default shortcuts for regular things, like archive/delete and opening tag/ratings dialogs, and also add shortcuts @@ -100,17 +100,17 @@ to the hash. For example: Here are a couple of duplicates, found despite their different resolution. -![](img/similar_gununu.png) +[[similar_gununu.png]] And some images of similar shape but not colour. -![](img/similar_icons.png) +[[similar_icons.png]] If you are careful, you can find images that look only *somewhat* like your hash. You get a lot of false positives with hamming distance of much more than 12, though. -![](img/similar_gununus.png) +[[similar_gununus.png]] ### PIL errors @@ -173,7 +173,7 @@ For instance, the following image (6c0ae65894c7a5ffd686f54cc052326b8ea188a691a1895b2f88b7c60a07f13f.jpg, in the help dir) is served here from disk: -![](img/6c0ae65894c7a5ffd686f54cc052326b8ea188a691a1895b2f88b7c60a07f13f.jpg) +[[6c0ae65894c7a5ffd686f54cc052326b8ea188a691a1895b2f88b7c60a07f13f.jpg]] And here it will attempt to load from the client: diff --git a/pages/changelog-parser b/pages/changelog-parser index 4715212..748b8cd 100644 --- a/pages/changelog-parser +++ b/pages/changelog-parser @@ -27,9 +27,18 @@ pandoc -f html -t markdown getting_started_files.html -o getting_started_files.m -\> -> -> +## + ## Use unified img directory -![]( -> ![](img/ +![](image) -> [[image]] + +!\[\]\((.+)\) - > [[\1]] + +## Repair double links +\[!\[\](.+)\)\]\(img/(.+)\) -> [[\2]] + +\[\[\[(.+)\).+$ -> [[\1]] pandoc -f html -t markdown future.html -o future.md pandoc -f html -t markdown getting_started_tags.html -o getting_started_tags.md diff --git a/pages/db_diagrams.md b/pages/db_diagrams.md index b35d919..91539e0 100644 --- a/pages/db_diagrams.md +++ b/pages/db_diagrams.md @@ -8,6 +8,6 @@ Here are current diagrams for the databases. They are not strict UML, just a general guide. I refer to them while coding, so I thought I might as well include them here. -![](img/client_database_diagram.png) +[[client_database_diagram.png]] -![](img/server_database_diagram.png) +[[server_database_diagram.png]] diff --git a/pages/depots.md b/pages/depots.md index 896502d..954e6aa 100644 --- a/pages/depots.md +++ b/pages/depots.md @@ -30,13 +30,13 @@ in future. Here are some diagrams: -![](img/message_sync_1.png) +[[message_sync_1.png]] -![](img/message_sync_2.png) +[[message_sync_2.png]] -![](img/message_sync_3.png) +[[message_sync_3.png]] -![](img/message_sync_4.png) +[[message_sync_4.png]] There is a little more to it (applying statuses to a message), but I have only half-implemented it. I shall flush out the description once it diff --git a/pages/getting_started_files.md b/pages/getting_started_files.md index 2733259..1a8f3a6 100644 --- a/pages/getting_started_files.md +++ b/pages/getting_started_files.md @@ -35,7 +35,7 @@ After a little parsing, a dialog will appear affirming what you want to import. Ok that and a new page will open. Thumbnails will stream in as the software processes each file. -[![](img/import.png)](img/import.png) +[[import.png]] The files are being imported into the client's database. [The client discards their filenames.](faq.html#filenames) @@ -120,7 +120,7 @@ The client can also download files from several websites, including 4chan, many boorus, and gallery sites like deviant art. The different options are under F9-\>download. -[![](img/downloads.png)](img/downloads.png) +[[downloads.png]] Most of them have similar interfaces. Paste the url or type the query your are interested in, and press enter. @@ -216,7 +216,7 @@ There are many ways to export files from the client: program. You can copy either of these addresses into a file open dialog like so: - [![](img/upload.png)](img/upload.png) + [[upload.png]] This works for file upload, opening a file in a graphics editor, or whatever. You can also paste into your browser's address bar, to @@ -245,7 +245,7 @@ There are many ways to export files from the client: mass-dump them to an imageboard. You'll be asked which board you want to dump to and then taken to a new page: - [![](img/dumping.png)](img/dumping.png) + [[dumping.png]] If you have a 4chan pass, you can authenticate the client in *services-\>manage 4chan pass*. Any new dump pages will no longer @@ -281,7 +281,7 @@ local search, it just uses a different file list. Files you do not have will be drawn with a dark background, those you do will be drawn as normal: -[![](img/lib_rec.png)](img/lib_rec.png) +[[lib_rec.png]] To download a file, double- or middle-click it, or select from the right click menu. diff --git a/pages/getting_started_messages.md b/pages/getting_started_messages.md index 930838b..a26b4a0 100644 --- a/pages/getting_started_messages.md +++ b/pages/getting_started_messages.md @@ -49,7 +49,7 @@ First, let's discern a couple differences: The dialog under *services-\>manage contacts and identities* lets you add new contacts. -![](img/contacts.png) +[[contacts.png]] *add manually* lets you enter the information in each field, while *add by contact address* grabs the public key from the server for you after @@ -74,7 +74,7 @@ some heavy math in the background, which should freeze the interface for a few seconds. This is it generating the contact's *private key*, which is the secret that lets it decrypt messages. -![](img/manage_services_edit_message_depot.png) +[[manage_services_edit_message_depot.png]] If you want to use the same identity with several clients, don't try to add the service in the usual way on your extra clients, or they will @@ -104,7 +104,7 @@ search message bodies/subjects, or use the system predicates to perform more complicated queries. Conversations that match will appear on the top right, and any selected convo will appear below. -[![](img/example_convo.png)](img/example_convo.png) +[[example_convo.png]] You can hit F7 or delete or just right click on a conversation above to archive or delete it. Beside each message, you can see its current diff --git a/pages/getting_started_ratings.md b/pages/getting_started_ratings.md index 9577102..7f0d73a 100644 --- a/pages/getting_started_ratings.md +++ b/pages/getting_started_ratings.md @@ -19,7 +19,7 @@ For now, since the client only supports local ratings, this is not terribly useful! You can define it in the *services-\>add, remove or edit services* dialog like so: -![](img/ratings_like.png) +[[ratings_like.png]] You can set the words for like or dislike as you like! @@ -30,7 +30,7 @@ This is just a clever way of saying something like 3 out of 5 stars or numbers only, no 3.5/5) based system. You can set the range however you like: -![](img/ratings_numerical.png) +[[ratings_numerical.png]] You can change these limits at a later date, and the database will adjust existing ratings appropriately (3/5 will go to 6/10, 9/10 will go @@ -41,7 +41,7 @@ to 4.5/5). Once you are sorted with your services, you can edit ratings for one or more files with F4: -![](img/ratings_dialog.png) +[[ratings_dialog.png]] If you hit F4 on one file, the dialog will show that file's ratings. If you hit F4 on several files, it'll try its best to show you a summary of @@ -54,12 +54,12 @@ If you would like to rate many files quickly, the client now lets you 'filter' them, like with the inbox/archive filter. You select it from some thumbnails' right-click menu as usual. -![](img/ratings_menu.png) +[[ratings_menu.png]] This will launch a new fullscreen window that will show already rated files beside the images you wish to rate: -![](img/ratings_filter.png) +[[ratings_filter.png]] Once it has exhausted currently rated files, it will try to compare the unrated files with each other. The current controls are: @@ -81,11 +81,11 @@ file in this range to narrow it down further. Ratings will show in the preview screen and fullscreen views, like so: -![](img/ratings_preview.png) +[[ratings_preview.png]] You can search with system:rating, and sort in the normal manner: -![](img/ratings_sort.png) +[[ratings_sort.png]] And that's it! Remote ratings will make this a *little* more complicated, but not much. diff --git a/pages/getting_started_tags.md b/pages/getting_started_tags.md index fd33c66..681b8b7 100644 --- a/pages/getting_started_tags.md +++ b/pages/getting_started_tags.md @@ -22,7 +22,7 @@ repository. You can create your own, if you like, and share access with whoever you like. I run a public tag repository, which you are very welcome to access and contribute to: -![](img/edit_repos_public_tag_repo.png) +[[edit_repos_public_tag_repo.png]] - 4a285629721ca442541ef2c15ea17d1f7f7578b0c3f4f5f2a05f8f0ab297786f@98.214.1.156:45871 @@ -36,31 +36,31 @@ little as it processes each update. You can watch its progress in the Once you are all set up, you start to type in a tag, and the autocomplete dropdown will offer suggestions for you: -[![](img/hidamari_ac.png)](img/hidamari_ac.png) +[[hidamari_ac.png]] Press up/down and enter to select, or double click with your mouse. Play with the buttons to see how they change your queries. -[![](img/hidamari.png)](img/hidamari.png) +[[hidamari.png]] More tags will narrow a search: -[![](img/hidamari_miyako.png)](img/hidamari_miyako.png) +[[hidamari_miyako.png]] Or, when prefixed with a hyphen, exclude: -[![](img/hidamari_exclude.png)](img/hidamari_exclude.png) +[[hidamari_exclude.png]] When you are more familiar with namespaces, sorting and collections, you can easily find and display whole books with just a few keystrokes: -[![](img/gunnerkrigg_chapter.png)](img/gunnerkrigg_chapter.png) +[[gunnerkrigg_chapter.png]] ### creating tags Hit F3 on a selection of files to open up the tagging dialog. -[![](img/manage_tags.png)](img/manage_tags.png) +[[manage_tags.png]] The dialog shows the **intersection** of the current selection's tags, and will add tags to/remove tags from the entire selection. Type a new diff --git a/pages/help.md b/pages/help.md index e5fdc70..f036b02 100644 --- a/pages/help.md +++ b/pages/help.md @@ -1,10 +1,10 @@ -[![](img/client_empty_small.png)](img/client_empty.png "the main screen, just after you start up") -[![](img/client_autism_small.png)](img/client_autism.png "an example search") -[![](img/lib_gc_small.png)](img/lib_gc.png "a well-tagged webcomic, sorted and viewed by chapter") -[![](img/client_fullscreen_small.png)](img/client_fullscreen.png "reading the webcomic in fullscreen") -[![](img/lib_rec_small.png)](img/lib_rec.png "file repository view, with some files local and some not") -[![](img/lib_party_hard_small.png)](img/lib_party_hard.png "now with swf support!") -[![](img/client_auto_small.png)](img/client_auto.png "an example of tag-autocomplete, which only displays results applicable to the current query") +[[client_empty.png|alt=the main screen, just after you start up]] +[[client_autism.png|alt=an example search]] +[[lib_gc.png|alt=a well-tagged webcomic, sorted and viewed by chapter]] +[[client_fullscreen.png|alt=reading the webcomic in fullscreen]] +[[lib_rec.png|alt=file repository view, with some files local and some not]] +[[lib_party_hard.png|alt=now with swf support!]] +[[client_auto.png|alt=an example of tag-autocomplete, which only displays results applicable to the current query]] ### hydrus help diff --git a/pages/introduction.md b/pages/introduction.md index 116a9b5..1b95cab 100644 --- a/pages/introduction.md +++ b/pages/introduction.md @@ -65,7 +65,7 @@ much more [planned](future.html). Here is a shot of the client, with a very general search: -[![](img/example_lib.png "WELCOME TO INTERNET")](img/example_lib.png) +[[example_lib.png]] ### statement of principles diff --git a/pages/tagging_schema.md b/pages/tagging_schema.md index 3203830..ed52beb 100644 --- a/pages/tagging_schema.md +++ b/pages/tagging_schema.md @@ -189,14 +189,14 @@ appropriately. These are not supposed to be 100% perfect or 100% done, but just to get you thinking: -![](tag_example_ainsley.jpg) +[[tag_example_ainsley.jpg]] - person:ainsley harriott - face - looking away - reaction image -![](tag_example_azura.jpg) +[[tag_example_azura.jpg]] Not sure if 'skyrim' should really be 'series:skyrim', but whatever. @@ -211,14 +211,14 @@ whatever. - shrine - statue -![](tag_example_feel.gif) +[[tag_example_feel.gif]] - that feel - face - i know that feel - reaction image -![](tag_example_mouse.jpg) +[[tag_example_mouse.jpg]] I don't know if the mouse is cheerful and alive or dead of a broken neck, so I've left that judgment out. @@ -231,7 +231,7 @@ I used to have an example from safebooru here, something obscure and japanese to show how helpful namespaces can be, but instead I'll put this: -[![](tag_example_five_star_small.png)](img\tag_example_five_star.png) +[[[tag_example_five_star_small.png)](img\tag_example_five_star.png]] Which someone else did and uploaded to my beta file repo. That is a five star effort. \ No newline at end of file diff --git a/pages/updates.md b/pages/updates.md index e499196..461db85 100644 --- a/pages/updates.md +++ b/pages/updates.md @@ -26,27 +26,27 @@ sooooometime. tags: -[![](img/tag_sync_1.png)](img/tag_sync_1.png) +[[tag_sync_1.png]] -[![](img/tag_sync_2.png)](img/tag_sync_2.png) +[[tag_sync_2.png]] -[![](img/tag_sync_3.png)](img/tag_sync_3.png) +[[tag_sync_3.png]] -[![](img/tag_sync_4.png)](img/tag_sync_4.png) +[[tag_sync_4.png]] files: -[![](img/file_sync_1.png)](img/file_sync_1.png) +[[file_sync_1.png]] -[![](img/file_sync_2.png)](img/file_sync_2.png) +[[file_sync_2.png]] -[![](img/file_sync_3.png)](img/file_sync_3.png) +[[file_sync_3.png]] -[![](img/file_sync_4.png)](img/file_sync_4.png) +[[file_sync_4.png]] -[![](img/file_sync_5.png)](img/file_sync_5.png) +[[file_sync_5.png]] -[![](img/file_sync_6.png)](img/file_sync_6.png) +[[file_sync_6.png]] ### the update request