Merge remote-tracking branch 'remotes/origin/master' into v1.1

# Conflicts:
#	app/components/start/start.html

Author: marc92w

app/components/settings/settings.html

@@ -1,17 +1,17 @@
 <div class="container">
 
-  <h2>SPARQL Queries</h2>
+  <h2>Retrieval Options</h2>
 
   <form name="extractionForm" class="form-horizontal well" role="form" novalidate>
     <div class="form-group" ng-class="{ 'has-error' : extractionForm.limit.$invalid && !extractionForm.limit.$pristine }">
-      <label class="control-label col-sm-3" for="lang">Label Language</label>
+      <label class="control-label col-sm-3" for="lang">Language of Labels</label>
       <div class="col-sm-4">
         <select class="form-control" name="lang" id="lang" ng-model="vm.currentLanguage"
                 ng-options="language.id as language.name for language in vm.availableLanguages">
         </select>
       </div>
 
-      <label for="limit" class="col-sm-2 control-label">Default Limit</label>
+      <label for="limit" class="col-sm-2 control-label">Number of Classes</label>
       <div class="col-sm-3">
         <input class="form-control" name="limit" id="limit" type="number" ng-model="vm.currentLimit" min="1" required/>
         <p ng-show="extractionForm.limit.$invalid && !extractionForm.limit.$pristine" class="help-block">
@@ -25,7 +25,7 @@ <h2>SPARQL Queries</h2>
         <div class="checkbox">
           <label>
             <input type="checkbox" name="ordered" ng-model="vm.propsOrdered">
-            fetch properties in descending order of their usage
+            retrieve properties in descending order of their usage frequency
           </label>
         </div>
       </div>

app/components/start/start.html

@@ -2,19 +2,12 @@
   <div class="jumbotron">
     <h1>LD-VOWL</h1>
     <p>
-      Extracts ontology information out of SPARQL endpoints and displays the extracted information in an overview visualization using the
-      <a href="http://vowl.visualdataweb.org" target="_blank">
+      Extract ontology information from SPARQL endpoints and display the extracted information in an overview visualization using the
+      <a href="http://vowl.visualdataweb.org/v2/" target="_blank">
         VOWL Notation
       </a>
       (with minor modifications).
     </p>
-
-    <p><strong>Endpoint requirements:</strong></p>
-    <ul>
-      <li>speaks SPARQL</li>
-      <li>returns JSON</li>
-      <li>allows CORS</li>
-    </ul>
   </div>
 
   <div class="well">
@@ -25,12 +18,12 @@ <h1>LD-VOWL</h1>
           <input name="url" id="endpoint" ng-model="start.endpoint" type="url" class="form-control"
                  title="SPARQL endpoint URL"
                  uib-typeahead="url for url in start.endpoints | filter:$viewValue | limitTo:8" required
-                 ng-minlength="7" typeahead-min-length="0" placeholder="Type in an URL or select some from the list"/>
+                 ng-minlength="7" typeahead-min-length="0" placeholder="Type in an URL or select one from the list"/>
         </div>
         <div class="col-sm-3">
           <button type="button" class="btn btn-primary" id="showGraph" ng-click="start.showGraph()"
                   ng-disabled="endpointForm.$invalid">
-            Show Graph &raquo;
+            Visualize &raquo;
           </button>
         </div>
       </div>
@@ -40,7 +33,8 @@ <h1>LD-VOWL</h1>
           <uib-alert  type="info" close="start.closeEndpointAlert()" style="margin-bottom: 0;">
             <span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span>
             A list of endpoints can be found
-            <a class="alert-link" href="http://sparqles.ai.wu.ac.at/availability" target="_blank">here</a>.
+            <a class="alert-link" href="http://sparqles.ai.wu.ac.at/availability" target="_blank">here</a>.<br/>
+            <small>Endpoint requirements: 1) speaks SPARQL, 2) returns JSON, 3) allows CORS.</small>
           </uib-alert>
         </div>
       </div>