summaryrefslogtreecommitdiff
path: root/share/www
diff options
context:
space:
mode:
authorJan Lehnardt <jan@apache.org>2009-03-17 11:52:57 +0000
committerJan Lehnardt <jan@apache.org>2009-03-17 11:52:57 +0000
commit2ee3c710ae726c31812cabb4827e777687ab660c (patch)
tree8021b824ae8a3a787663b7ca6bf08f9dceb8abe2 /share/www
parent32277eecee96b3c34ae71ea2e0fc9e9284f1dcb7 (diff)
show group=true notice only when view results are shown
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@755205 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'share/www')
-rw-r--r--share/www/database.html4
-rw-r--r--share/www/script/futon.browse.js2
-rw-r--r--share/www/style/layout.css1
3 files changed, 5 insertions, 2 deletions
diff --git a/share/www/database.html b/share/www/database.html
index 1f7f6ab2..fbc0a5d7 100644
--- a/share/www/database.html
+++ b/share/www/database.html
@@ -192,8 +192,8 @@ specific language governing permissions and limitations under the License.
</tr>
</tbody>
</table>
- <p>
- Views with a reduce function will return a single row of reduced values.
+ <p id="grouptruenotice">
+ <strong>Note</strong>: Views with a reduce function will return a single row of reduced values.
If you are looking for the same results that you can see here in Futon,
add a <code>?group=true</code> parameter to your view query. Futon does
this automatically.
diff --git a/share/www/script/futon.browse.js b/share/www/script/futon.browse.js
index 30cff66e..5fd09f94 100644
--- a/share/www/script/futon.browse.js
+++ b/share/www/script/futon.browse.js
@@ -199,12 +199,14 @@
}
$("#language").change(updateDirtyState);
});
+ $("#grouptruenotice").show();
} else if (viewName == "_temp_view") {
page.viewLanguage = $.cookies.get(db.name + ".language", page.viewLanguage);
page.updateViewEditor(
$.cookies.get(db.name + ".map", templates[page.viewLanguage]),
$.cookies.get(db.name + ".reduce", "")
);
+ $("#grouptruenotice").show();
}
page.populateLanguagesMenu();
if (this.isTempView) {
diff --git a/share/www/style/layout.css b/share/www/style/layout.css
index 0971c2ee..7cf89e3b 100644
--- a/share/www/style/layout.css
+++ b/share/www/style/layout.css
@@ -333,6 +333,7 @@ ul.suggest-dropdown li.selected { cursor: pointer; background: Highlight;
#viewcode.collapsed table, #viewcode.collapsed .bottom { display: none; }
#tempwarn { display: none; font-size: 90%; margin: 0 2em 1.5em; }
+#grouptruenotice { display: none; font-size: 90%; margin: 1ex 2em 1.5em; }
/* Database table */