Merge pull request #23 from omeka/develop

Updating

content/items.md

@@ -43,17 +43,29 @@ The Values tab is where you enter metadata, such as title, description, etc.
 
 ![Basic view of add items page, with no content entered](../content/contentfiles/items_add1.png)
 
-1. If available and appropriate, select a resource template from the drop-down menu. Resource templates are defined by the site administrators and editors.
+You can select a resource template from the drop-down menu. Resource templates are defined by the site administrators and editors.
   * If using a resource template, the class should automatically load.
-  * If not using a resource template, select a class from the dropdown menu (these are populated from the [Vocabularies](/content/vocabularies.md) in your installation).
-1. Add information to the fields provided.  
-  1. You may add text, a resource from the installation, or an external link in each field.  
-    * **Text** fields are entered with text, which can include HTML code. The keyboard at the top of the field input indicates text. The globe icon which appears next to it can be used to set language. 
+  * If not using a resource template, you may select a class from the dropdown menu (these are populated from the [Vocabularies](/content/vocabularies.md) in your installation).
+
+Add information to the properties which load. If you do not select a resource template or class, the Dublin Core properties Title and Description will load automatically.    
+You may add text, a resource from the installation, or an external link in each field.  
+
+#### Text
+Text fields are entered with text, which can include HTML code. The keyboard at the top of the field input indicates text. The globe icon which appears next to it can be used to set language. 
 ![image of text input field with keyboard icon indicating text input, the globe icon for setting language, and a trashcan delete icon](../content/contentfiles/items_textedit.png)
-    * **Omeka Resource** fields create an internal link between the resource you are creating and the resource which fills that field. You have the option to use either another item or an item set. Once you select an item or item set, detailed information will load, and you must click *select resource* to finish linking the resources. You can also click the *X* button in the upper right-hand corner to go back to the list of items or item sets.
+
+#### Omeka Resource
+Omeka Resource fields create an internal link between the resource you are creating and the resource which fills that field. You have the option to use either another item or an item set. Once you select an item or item set, detailed information will load, and you must click *select resource* to finish linking the resources. You can also click the *X* button in the upper right-hand corner to go back to the list of items or item sets.
      ![Select Item menu with list of items to link in edit item view](../content/contentfiles/items_addresource.png)
-    * **URI** fields link to an external website or online resource.
-1. You may add other fields by selecting a property from the list on the right. Browse fields by vocabulary (Dublin Core, Bibliographic Ontology, etc), or search in the *filter properties* bar above the list of properties and vocabularies.
+
+#### URI
+URI fields link to an external website or online resource.
+
+You may add other fields by selecting a property from the list on the right. Browse fields by vocabulary (Dublin Core, Bibliographic Ontology, etc), or search in the *filter properties* bar above the list of properties and vocabularies.
+
+You can indicate the language for the content of a text input using the globe symbol above the input (see the red arrow in the image below). Click on the globe to activate a text field, then enter the [ISO 639-1](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes) code for the language in which the text is written.
+
+![Red arrow points to the globe icon and a text entry field highlighted in blue](../content/contentfiles/item_lang.png)
 
 ### Media
 Use the *Media* tab to add images, video, or other files.

content/resource-template.md

@@ -10,6 +10,13 @@ Resource templates are managed from the Admin Dashboard, accessed through the le
 
 From this tab, you can sort existing templates by *label*, *class*, or number of *items* assigned to that template, using the up-down arrow icon next to each column heading. You can also use the icons in each template’s row to: *edit* (pencil), *delete* (trash can), or *view details* (ellipses). If you click on the number of items listed for a template, it will take you to a list of all those items. 
 
+## Base Resource
+All Omeka S installations include a Base Resource template which maps to the metadata fields required by the Digital Public Library of America (DPLA). It will display in the table of resource templates as "Base Resource" with no owner. 
+
+![Base resource template displayed in the table of templates](contentfiles/templates_base1.png)
+
+The Base Resource template contains the following Dublin Core fields: Title; Rights; Type; Creator; Date; Description; Format; Language; Spatial Coverage (Place); Publisher; Alternative Title: Contributor; Extent; Identifier; Relation; Is Replaced By; Replaces; RightsHolder; Subject; Temporal Coverage.
+
 ## Create a resource template
 1. From the Resource Templates tab in the Admin Dashboard, click the *Add new resource template* button.
 1. In the Label property, type the label for your new template. This will be the text displayed in the dropdown for Resource Templates when creating an item, so be sure that the label is clear.

errorLogging.md

@@ -0,0 +1,9 @@
+---
+title: Error Logging
+---
+If you are experiencing problems with your Omeka S installation, or you want to turn on development-style error tracking, you will need to edit the `.htaccess` and `local.config.php` files. You must use a ftp or terminal client to do so; if you're not sure how to do this, please contact your system administrator or hosting provider. 
+
+- The `.htaccess` file is located in the main folder of your Omeka S installation.
+    - Change line 1 of that file from `SetEnv APPLICATION_ENV "production"` to `SetEnv APPLICATION_ENV "development"`
+- The `local.config.php` file is located in the config folder.
+    - Change line 4 from `'log' => false,` to `'log' => true,`

index.md

@@ -7,14 +7,16 @@ Omeka S is a web publication system for universities, galleries, libraries, arch
 Omeka S is part of the [Omeka](http://omeka.org) family of products
 
 Site map:
-* [Admin Dashboard](/admin-dashboard.md)
-* [Manage Settings](settings.md)
+
+- [Admin Dashboard](/admin-dashboard.md)
+- [Manage Settings](settings.md)
 * [Manage Users](/users.md)
-[Jobs](jobs.md)
+* [Jobs](jobs.md)
 * Content
   * [Items](/content/items.md)
   * [Item Sets](/content/item-sets.md). Manage aggregated groups of items. 
   * [Vocabularies](/content/vocabularies.md). Manage the metadata standards for your install.
   * [Resource Templates](/content/resource-template.md). Manage predefined sets of properties 
 * [Modules](modules/modules.md)
-* [Sites](/sites/sites.md)
+* [Sites](/sites/sites.md)
+* [Error Logging](/errorLogging.md)

modules/csvimport.md

@@ -11,8 +11,22 @@ Most spreadsheet editors (including Microsoft Excel, Google Sheets, and Apple Nu
 
 If the spreadsheet is already created, take a moment to think about which columns you want to match to which vocabulary properties. 
 
+*Note* Your csv file *must have a header row* in order for the module to process it correctly.
+
 If you have multiple inputs for a single property, you can separate them with a secondary *multivalue separator*. For example, a work with multiple authors (E.B. White and William Strunk Jr.) with the column for Creator containing "E.B. White; William Strunk Jr" has a semicolon (;) as the multivalue separator. When imported into Omeka S, each of these would appear as a separate entry in the property (Creator: E.B. White and Creator: William Strunk Jr.)
 
+### Automapping 
+The module can automap column headers if they conform to the property terms of your installation's [vocabularies](../content/vocabularies.md). For example, a CSV file with a column header "dcterms:title" would automap to the Dublin Core Title property when the CSV is loaded for mapping.
+
+To find the terms you should use for your column headers, go to the Vocabularies tab from the admin dashboard. Click on the number of properties for the vocabulary you want to use (Dublin Core in the image below)
+
+![Red arrow points to the properties link for Dublin Core](../modules/modulesfiles/csv_automap1.png)
+
+In the table of vocabulary properties, there is a column for *Term*. Use the Term for the property you want to automap in the CSV Import. For example, "dcterms:abstract" would automap to the Dublin Core property "Absract" and "foaf:firstName" would automap to the Friend of a Friend property "firstName"
+
+![arrow points to the Term column for Dublin Core properties.](../modules/modulesfiles/csv_automap2.png)
+
+
 Importing
 ---------
 [Install and activate](../modules/modules.md#installing-modules) the CSV Importer module. Once active, the module will add a tab to the left-hand navigation of your Omeka S install dashboard, under the Modules heading. 
@@ -28,6 +42,7 @@ Start an import by clicking on the CSV Importer tab on the left-hand navigation.
 
 ### Items Import
 The next page of the Importer has two tabs:  
+
 #### Basic Import Settings
 has the following fields, none of which are required: 
 - *Comment*: make a note on the import.
@@ -47,7 +62,9 @@ Each column in your CSV file will appear as a block with a the *CSV Column* head
 
 All actions have the option to indicate that this column data uses the multivalue separator.
 
-*Map* (this option will only be available if you have installed the [mapping](../modules/mapping.md) module)
+**Map** 
+
+(this option will only be available if you have installed the [mapping](../modules/mapping.md) module)
 Select whether this column contains: 
 - Latitude
 - Longitude
@@ -58,13 +75,15 @@ Select whether this column contains:
 
 ![Mapping options for geolocation data](../modules/modulesfiles/csvimport_itemsgeo.png)
 
-*Properties* 
+**Properties** 
+
 Select from the properties of all installed vocabularies. You can search for a specific property using the *Filter properties* field at the top of the drawer. 
 You can choose to import the content as a URL.
 
 ![Mapping options for properties data](../modules/modulesfiles/csvimport_iproperties.png)
 
-*Media Import*
+**Media Import**
+
 Select one of the following:
 - URL
 - HTML
@@ -74,7 +93,8 @@ Select one of the following:
 
 ![Mapping options for media](../modules/modulesfiles/csvimport_imedia.png)
 
-*Item Data*
+**Item Data**
+
 These actions allow you to set the column data as:
 - Item Set ID
 - Resource Template Name