aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
Diffstat (limited to 'view')
-rw-r--r--view/css/mod_zchannel.css (renamed from view/css/mod_zentity.css)12
-rw-r--r--view/js/mod_zchannel.js17
-rw-r--r--view/js/mod_zentity.js17
-rw-r--r--view/php/mod_zchannel.php (renamed from view/php/mod_zentity.php)0
-rw-r--r--view/tpl/channel.tpl4
-rw-r--r--view/tpl/diaspora_vcard.tpl18
-rw-r--r--view/tpl/zchannel.tpl29
-rw-r--r--view/tpl/zentity.tpl29
8 files changed, 63 insertions, 63 deletions
diff --git a/view/css/mod_zentity.css b/view/css/mod_zchannel.css
index 402572a38..1b4527a99 100644
--- a/view/css/mod_zentity.css
+++ b/view/css/mod_zchannel.css
@@ -4,36 +4,36 @@ h2 {
margin-top: 15%;
}
-#zentity-form {
+#zchannel-form {
font-size: 1.4em;
margin-left: 15%;
margin-top: 5%;
width: 50%;
}
-#zentity-form .descriptive-paragraph {
+#zchannel-form .descriptive-paragraph {
color: #888;
margin-left: 20px;
margin-bottom: 25px;
}
-.zentity-label {
+.zchannel-label {
float: left;
width: 275px;
}
-.zentity-input {
+.zchannel-input {
float: left;
width: 275px;
padding: 5px;
}
-.zentity-feedback {
+.zchannel-feedback {
float: left;
margin-left: 5px;
}
-.zentity-field-end {
+.zchannel-field-end {
clear: both;
margin-bottom: 20px;
}
diff --git a/view/js/mod_zchannel.js b/view/js/mod_zchannel.js
new file mode 100644
index 000000000..9f85295d7
--- /dev/null
+++ b/view/js/mod_zchannel.js
@@ -0,0 +1,17 @@
+ $(document).ready(function() {
+ $("#zchannel-name").blur(function() {
+ var zreg_name = $("#zchannel-name").val();
+ $.get("zchannel/autofill.json?f=&name=" + encodeURIComponent(zreg_name),function(data) {
+ $("#zchannel-nickname").val(data);
+ zFormError("#zchannel-name-feedback",data.error);
+ });
+ });
+ $("#zchannel-nickname").blur(function() {
+ var zreg_nick = $("#zchannel-nickname").val();
+ $.get("zchannel/checkaddr.json?f=&nick=" + encodeURIComponent(zreg_nick),function(data) {
+ $("#zchannel-nickname").val(data);
+ zFormError("#zchannel-nickname-feedback",data.error);
+ });
+ });
+
+ });
diff --git a/view/js/mod_zentity.js b/view/js/mod_zentity.js
deleted file mode 100644
index ad78db7d4..000000000
--- a/view/js/mod_zentity.js
+++ /dev/null
@@ -1,17 +0,0 @@
- $(document).ready(function() {
- $("#zentity-name").blur(function() {
- var zreg_name = $("#zentity-name").val();
- $.get("zentity/autofill.json?f=&name=" + encodeURIComponent(zreg_name),function(data) {
- $("#zentity-nickname").val(data);
- zFormError("#zentity-name-feedback",data.error);
- });
- });
- $("#zentity-nickname").blur(function() {
- var zreg_nick = $("#zentity-nickname").val();
- $.get("zentity/checkaddr.json?f=&nick=" + encodeURIComponent(zreg_nick),function(data) {
- $("#zentity-nickname").val(data);
- zFormError("#zentity-nickname-feedback",data.error);
- });
- });
-
- });
diff --git a/view/php/mod_zentity.php b/view/php/mod_zchannel.php
index e7709cbd8..e7709cbd8 100644
--- a/view/php/mod_zentity.php
+++ b/view/php/mod_zchannel.php
diff --git a/view/tpl/channel.tpl b/view/tpl/channel.tpl
index eb9635ce8..0702bb50b 100644
--- a/view/tpl/channel.tpl
+++ b/view/tpl/channel.tpl
@@ -1,5 +1,5 @@
<div class="channel-selection">
-<a href="$channel.link" class="channel-selection-photo-link" title="$channel.entity_name"><img class="channel-photo" src="$channel.thumb" alt="$channel.entity_name" /></a>
-<a href="$channel.link" class="channel-selection-name-link" title="$channel.entity_name"><div class="channel-name">$channel.entity_name</div></a>
+<a href="$channel.link" class="channel-selection-photo-link" title="$channel.channel_name"><img class="channel-photo" src="$channel.thumb" alt="$channel.channel_name" /></a>
+<a href="$channel.link" class="channel-selection-name-link" title="$channel.channel_name"><div class="channel-name">$channel.channel_name</div></a>
</div>
<div class="channel-selection-end"></div>
diff --git a/view/tpl/diaspora_vcard.tpl b/view/tpl/diaspora_vcard.tpl
index de3981a94..8d889cd4a 100644
--- a/view/tpl/diaspora_vcard.tpl
+++ b/view/tpl/diaspora_vcard.tpl
@@ -1,54 +1,54 @@
<div style="display:none;">
- <dl class='entity_nickname'>
+ <dl class='channel_nickname'>
<dt>Nickname</dt>
<dd>
<a class="nickname url uid" href="$diaspora.podloc/" rel="me">$diaspora.nickname</a>
</dd>
</dl>
- <dl class='entity_fn'>
+ <dl class='channel_fn'>
<dt>Full name</dt>
<dd>
<span class='fn'>$diaspora.fullname</span>
</dd>
</dl>
- <dl class='entity_given_name'>
+ <dl class='channel_given_name'>
<dt>First name</dt>
<dd>
<span class='given_name'>$diaspora.firstname</span>
</dd>
</dl>
- <dl class='entity_family_name'>
+ <dl class='channel_family_name'>
<dt>Family name</dt>
<dd>
<span class='family_name'>$diaspora.lastname</span>
</dd>
</dl>
- <dl class="entity_url">
+ <dl class="channel_url">
<dt>URL</dt>
<dd>
<a class="url" href="$diaspora.podloc/" id="pod_location" rel="me">$diaspora.podloc/</a>
</dd>
</dl>
- <dl class="entity_photo">
+ <dl class="channel_photo">
<dt>Photo</dt>
<dd>
<img class="photo avatar" height="300" width="300" src="$diaspora.photo300">
</dd>
</dl>
- <dl class="entity_photo_medium">
+ <dl class="channel_photo_medium">
<dt>Photo</dt>
<dd>
<img class="photo avatar" height="100" width="100" src="$diaspora.photo100">
</dd>
</dl>
- <dl class="entity_photo_small">
+ <dl class="channel_photo_small">
<dt>Photo</dt>
<dd>
<img class="photo avatar" height="50" width="50" src="$diaspora.photo50">
</dd>
</dl>
- <dl class="entity_searchable">
+ <dl class="channel_searchable">
<dt>Searchable</dt>
<dd>
<span class="searchable">$diaspora.searchable</span>
diff --git a/view/tpl/zchannel.tpl b/view/tpl/zchannel.tpl
new file mode 100644
index 000000000..d714d8a59
--- /dev/null
+++ b/view/tpl/zchannel.tpl
@@ -0,0 +1,29 @@
+<h2>$title</h2>
+
+<form action="zchannel" method="post" id="zchannel-form">
+
+ <div id="zchannel-desc" class="descriptive-paragraph">$desc</div>
+
+ <label for="zchannel-name" id="label-zchannel-name" class="zchannel-label" >$label_name</label>
+ <input type="text" name="name" id="zchannel-name" class="zchannel-input" value="$name" />
+ <div id="zchannel-name-feedback" class="zchannel-feedback"></div>
+ <div id="zchannel-name-end" class="zchannel-field-end"></div>
+
+ <div id="zchannel-name-help" class="descriptive-paragraph">$help_name</div>
+
+ <label for="zchannel-nickname" id="label-zchannel-nickname" class="zchannel-label" >$label_nick</label>
+ <input type="text" name="nickname" id="zchannel-nickname" class="zchannel-input" value="$nickname" />
+ <div id="zchannel-nickname-feedback" class="zchannel-feedback"></div>
+ <div id="zchannel-nickname-end" class="zchannel-field-end"></div>
+
+ <div id="zchannel-nick-desc" class="descriptive-paragraph">$nick_desc</div>
+
+
+ <input type="checkbox" name="import" id="zchannel-import" value="1" />
+ <label for="zchannel-import" id="label-zchannel-import">$label_import</label>
+ <div id="zchannel-import-end" class="zchannel-field-end"></div>
+
+ <input type="submit" name="submit" id="zchannel-submit-button" value="$submit" />
+ <div id="zchannel-submit-end" class="zchannel-field-end"></div>
+
+</form>
diff --git a/view/tpl/zentity.tpl b/view/tpl/zentity.tpl
deleted file mode 100644
index b2da59934..000000000
--- a/view/tpl/zentity.tpl
+++ /dev/null
@@ -1,29 +0,0 @@
-<h2>$title</h2>
-
-<form action="zentity" method="post" id="zentity-form">
-
- <div id="zentity-desc" class="descriptive-paragraph">$desc</div>
-
- <label for="zentity-name" id="label-zentity-name" class="zentity-label" >$label_name</label>
- <input type="text" name="name" id="zentity-name" class="zentity-input" value="$name" />
- <div id="zentity-name-feedback" class="zentity-feedback"></div>
- <div id="zentity-name-end" class="zentity-field-end"></div>
-
- <div id="zentity-name-help" class="descriptive-paragraph">$help_name</div>
-
- <label for="zentity-nickname" id="label-zentity-nickname" class="zentity-label" >$label_nick</label>
- <input type="text" name="nickname" id="zentity-nickname" class="zentity-input" value="$nickname" />
- <div id="zentity-nickname-feedback" class="zentity-feedback"></div>
- <div id="zentity-nickname-end" class="zentity-field-end"></div>
-
- <div id="zentity-nick-desc" class="descriptive-paragraph">$nick_desc</div>
-
-
- <input type="checkbox" name="import" id="zentity-import" value="1" />
- <label for="zentity-import" id="label-zentity-import">$label_import</label>
- <div id="zentity-import-end" class="zentity-field-end"></div>
-
- <input type="submit" name="submit" id="zentity-submit-button" value="$submit" />
- <div id="zentity-submit-end" class="zentity-field-end"></div>
-
-</form>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 11:40:59 +0000