diff --git a/handbook/computing/gpxupload.html b/handbook/computing/gpxupload.html index 633939d5d..f5f3bb219 100644 --- a/handbook/computing/gpxupload.html +++ b/handbook/computing/gpxupload.html @@ -23,6 +23,10 @@ unavoidable complexities in getting the GPX file out of your device.

(If you are looking for how to upload some photos instead, those instructions are here). +

TEMPORARY FIX 2022

+

The form to make this easy is not yet written [March 2022]. So use the Photo Upload Form which +temporarily will also work for GPX files. +

Instructions: contents

  1. Get the GPX file that holds your locations and wanderings from your phone. diff --git a/handbook/i/Wolfhohle1983-08-08.jpg b/handbook/i/Wolfhohle1983-08-08.jpg deleted file mode 100644 index 4ff76fb69..000000000 Binary files a/handbook/i/Wolfhohle1983-08-08.jpg and /dev/null differ diff --git a/handbook/i/wolfhohle_1983-08-08.jpg b/handbook/i/wolfhohle_1983-08-08.jpg new file mode 100644 index 000000000..b1e833980 Binary files /dev/null and b/handbook/i/wolfhohle_1983-08-08.jpg differ diff --git a/handbook/survey/cavedescription.html b/handbook/survey/cavedescription.html index 7f9aaece0..fe3cbb4d1 100644 --- a/handbook/survey/cavedescription.html +++ b/handbook/survey/cavedescription.html @@ -26,7 +26,6 @@ the QMs and before the *end .

    The description is written as a single long line of text. In the online editor it is wrapped to fit the window. - ;------------
    ;Cave description ;(leave commented-out)
    @@ -43,10 +42,81 @@ straighforward p10.

    You can have several lines of description, as you can see if you follow the link above, but each one must be prefixed with a semi-colon otherwise the survex software will complain. -

    Technical Note: The syntax for a Cave Description, both the title and the text includes a leading semi-colon. -So it is syntactically a "comment" so far as the survex software is concerned. +So it is syntactically a "comment" so far as the survex software +is concerned. + + +

    In the Cave Definition file

    +

    When you look at a cave listed in the list on the "Caves"" page, such as /1623/290/290.html, and you click on "Edit this cave" in the left-hand menu when you are +logged-on, you will see the Cave Registration editing and update form. +All the cave description you read on the Cave +page is set in the text box "Underground description" on the form in +HTML. +

    So for an existing cave, where someone has already done the +initial cave registration process, you can easily add in your description of your new +passage by cutting and pasting from your survex file, e.g. +toto_to_crystalcrumble.svx into the +end of the text in the "Underground description" text box. +

    You can drag the corners of the "Underground description" text box on the cave registration form to make it easier to edit the HTML. +Just separate the paragraphs with <P> codes and it will work. (You don't need the semi-colons any more.) + +

    +Technical Note: The information in the cave registration form is saved to the server as a file, which is +committed to the version control system automatically, as +well as being registered in the online database used by the website publication software. If you are a nerd with a +basic expo laptop, you can edit the file directly. +For Fischgesicht (originally 2017-CUCC-28 and now 1623/290), this is in the +:expoweb: repo, in /cave_data/1623-290.html, but you will have to manage the git commit process yourself. + +

    Fischgesicht currently (pre-2022 expo) has 25 survex files (listed here +now, or here in future). You could do a useful job by +checking all those survex files to see if the cave description in them has already been copied into the cave registration form +"Underground description" text box. + +

    More complex caves

    +

    Fischgesicht currently has only one cave description file. Older, more complex caves such as Balkonhöhle +have the cave description separated out into several HTML files. The field of the cave registration form "Description file", +which was blank for Fischgesicht, has a filename in it on the Balkonhöhle form: "1623/264/ent.html" + which is in the :expoweb: repo folder. +

    Unfortunately, you cannot (yet) use the "Edit This Page" capability to edit those + webpages from any web browser and you will need to use the expo laptop in the potato hut to play + with the files directly. (Or elevate yourself to nerd status and configure your own laptop as a + basic expo laptop yourself.) + +

    Adding photographs to cave descriptions

    +

    Cave Schwa Höhle 1623/81 is a simple cave and if you look at its +cave registration form online +and look in the "Survey" field, you will see that the "Survey" text box contains the HTML code for several images of cave surveys +with relative filepaths like this: +

    <img src="../others/82_area_plan.png" alt="Survey" />
    +
    +These are relative to where the cave description will be published, which is specified in the +"URL" field. +

    The reason why they are relative to the published webpage is that it is your own web browser which is interpreting +the <IMG> link, and it will use that to ask the server for the image. + +

    Now it is a good idea to go and read the "Edit Cave Form" part of the handbook page +Creating a new cave in the online system which compares the two caves 171 and 172 and how their photograph +data is stored slightly differently. + +

    The "URL" field has a helpful hint next to it in square brackets: [1623/000/000] to remind you of the right format +when you are creating a new cave. For this cave +the URL is set to 1623/264/264.html. [Note that depsite having ".html" at the end of it, this is not a real file: it is generated by the website publication software to contain +all these bits of information.] +

    The real file holding the cave description is in the "Description file" field which says +1623/264/ent.html and is in the :expoweb: repo. + +

    Summary

    +

    So using just a web browser you can edit the HTML for the top-level cave description, and you can add in links to +photos so long as they are already +uploaded to the system in the right place for that cave. +

    It is instructive to look at the cave registration form for Balkonhöhle at the same time as +reading the published cave description in another browser window. +You will see how the different parts are assembled into one overall description. You will need to know this before +you can edit the HTML of complex caves directly.


    Return to "Survey handbook - survex format"
    diff --git a/handbook/survey/caveentry.html b/handbook/survey/caveentry.html index 67e4d001b..9658b26f3 100644 --- a/handbook/survey/caveentry.html +++ b/handbook/survey/caveentry.html @@ -104,7 +104,7 @@ the New Cave form - but not yet. New Cave
    just above where it also says "Cave Number Index - kept updated".
    But don't click on it yet, first we will edit an old cave.

    -

    Edit Cave form

    +

    Edit Cave form

    First make sure that you are logged-in to the troggle website. You almost certainly are already, but if you are trying this on a new machine this can catch you out. Go to diff --git a/handbook/survey/newcave.html b/handbook/survey/newcave.html index 525a4aeee..21506b9fb 100644 --- a/handbook/survey/newcave.html +++ b/handbook/survey/newcave.html @@ -95,6 +95,7 @@ New cave process ├── 3 Creating a new survex file │ ├── How to create a survex file - PDF - Brendan's guide │ ├── From muddy book to survex plot +│ ├── Cave description │ └── Adding QMs (Question Marks) ├── 4 Drawing up your survey │ ├── How to use Tunnel - PDF - Brendan's guide diff --git a/handbook/survey/newsurvex.html b/handbook/survey/newsurvex.html index ba2a3a897..8115c27b9 100644 --- a/handbook/survey/newsurvex.html +++ b/handbook/survey/newsurvex.html @@ -127,6 +127,16 @@ straighforward p10. to make it easier for yourself. See more detail in the Cave Description" handbook page which also describes eventual HTML publication. +

    +
    + + +
    +Wolfhöhle raw survey data 1983 - Austrian mud (click to enlarge) +
    +
    +
    +

    Using the direct online system

    This is where you type up the hand-scrawled notes directly into a a web browser, creating a new online survex file automatically in the right place on the online system. diff --git a/handbook/t/Wolfhohle1983-08-08.jpg b/handbook/t/wolfhohle_1983-08-08.jpg similarity index 100% rename from handbook/t/Wolfhohle1983-08-08.jpg rename to handbook/t/wolfhohle_1983-08-08.jpg