aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme
diff options
context:
space:
mode:
authortomtom84 <63dc41d76451@ba77e90e49a6.anonbox.net>2012-03-03 04:30:31 -0800
committertomtom84 <63dc41d76451@ba77e90e49a6.anonbox.net>2012-03-03 04:30:31 -0800
commit8ffe15fbb1290fac839189f2de337efec223c5e1 (patch)
tree3763a0e593c619083734a7ef578f5b2dfbf92948 /view/theme
parent9d885c4801e74205dc958aaf4a17f44c4d9134d6 (diff)
parent60adef24634f3df6c9f0161128e10cb778e5316e (diff)
downloadvolse-hubzilla-8ffe15fbb1290fac839189f2de337efec223c5e1.tar.gz
volse-hubzilla-8ffe15fbb1290fac839189f2de337efec223c5e1.tar.bz2
volse-hubzilla-8ffe15fbb1290fac839189f2de337efec223c5e1.zip
Merge pull request #64 from tomtom84/master
fix editor in theme diabook
Diffstat (limited to 'view/theme')
-rwxr-xr-xview/theme/diabook/icons/attach.pngbin0 -> 862 bytes
-rwxr-xr-xview/theme/diabook/icons/audio.pngbin0 -> 655 bytes
-rwxr-xr-xview/theme/diabook/icons/camera.pngbin0 -> 568 bytes
-rwxr-xr-xview/theme/diabook/icons/globe.pngbin0 -> 680 bytes
-rwxr-xr-xview/theme/diabook/icons/unglobe.pngbin0 -> 659 bytes
-rwxr-xr-xview/theme/diabook/icons/unlock.pngbin0 -> 314 bytes
-rwxr-xr-xview/theme/diabook/icons/video.pngbin0 -> 373 bytes
-rwxr-xr-xview/theme/diabook/icons/weblink.pngbin0 -> 305 bytes
-rwxr-xr-xview/theme/diabook/jot.tpl83
-rw-r--r--view/theme/diabook/style.css128
10 files changed, 204 insertions, 7 deletions
diff --git a/view/theme/diabook/icons/attach.png b/view/theme/diabook/icons/attach.png
new file mode 100755
index 000000000..4412d94a5
--- /dev/null
+++ b/view/theme/diabook/icons/attach.png
Binary files differ
diff --git a/view/theme/diabook/icons/audio.png b/view/theme/diabook/icons/audio.png
new file mode 100755
index 000000000..075e04734
--- /dev/null
+++ b/view/theme/diabook/icons/audio.png
Binary files differ
diff --git a/view/theme/diabook/icons/camera.png b/view/theme/diabook/icons/camera.png
new file mode 100755
index 000000000..8769cc82f
--- /dev/null
+++ b/view/theme/diabook/icons/camera.png
Binary files differ
diff --git a/view/theme/diabook/icons/globe.png b/view/theme/diabook/icons/globe.png
new file mode 100755
index 000000000..daec0c256
--- /dev/null
+++ b/view/theme/diabook/icons/globe.png
Binary files differ
diff --git a/view/theme/diabook/icons/unglobe.png b/view/theme/diabook/icons/unglobe.png
new file mode 100755
index 000000000..ddcdfa23c
--- /dev/null
+++ b/view/theme/diabook/icons/unglobe.png
Binary files differ
diff --git a/view/theme/diabook/icons/unlock.png b/view/theme/diabook/icons/unlock.png
new file mode 100755
index 000000000..3d6543087
--- /dev/null
+++ b/view/theme/diabook/icons/unlock.png
Binary files differ
diff --git a/view/theme/diabook/icons/video.png b/view/theme/diabook/icons/video.png
new file mode 100755
index 000000000..c9a905e32
--- /dev/null
+++ b/view/theme/diabook/icons/video.png
Binary files differ
diff --git a/view/theme/diabook/icons/weblink.png b/view/theme/diabook/icons/weblink.png
new file mode 100755
index 000000000..45c471e6c
--- /dev/null
+++ b/view/theme/diabook/icons/weblink.png
Binary files differ
diff --git a/view/theme/diabook/jot.tpl b/view/theme/diabook/jot.tpl
new file mode 100755
index 000000000..bb0f4b6d0
--- /dev/null
+++ b/view/theme/diabook/jot.tpl
@@ -0,0 +1,83 @@
+
+<div id="profile-jot-wrapper" >
+ <div id="profile-jot-banner-wrapper">
+ <div id="profile-jot-desc" >&nbsp;</div>
+ <div id="character-counter" class="grey"></div>
+ </div>
+ <div id="profile-jot-banner-end"></div>
+
+ <form id="profile-jot-form" action="$action" method="post" >
+ <input type="hidden" name="type" value="$ptyp" />
+ <input type="hidden" name="profile_uid" value="$profile_uid" />
+ <input type="hidden" name="return" value="$return_path" />
+ <input type="hidden" name="location" id="jot-location" value="$defloc" />
+ <input type="hidden" name="coord" id="jot-coord" value="" />
+ <input type="hidden" name="post_id" value="$post_id" />
+ <input type="hidden" name="preview" id="jot-preview" value="0" />
+ <input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
+ <img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+ <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
+
+
+<div id="profile-jot-submit-wrapper" class="jothidden">
+
+ <div id="profile-upload-wrapper" style="display: $visitor;" >
+ <div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="camera" title="$upload"></a></div>
+ </div>
+ <div id="profile-attach-wrapper" style="display: $visitor;" >
+ <div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="attach" title="$attach"></a></div>
+ </div>
+
+ <div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
+ <a id="profile-link" class="weblink" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
+ </div>
+ <div id="profile-video-wrapper" style="display: $visitor;" >
+ <a id="profile-video" class="video" title="$video" onclick="jotVideoURL();return false;"></a>
+ </div>
+ <div id="profile-audio-wrapper" style="display: $visitor;" >
+ <a id="profile-audio" class="audio" title="$audio" onclick="jotAudioURL();return false;"></a>
+ </div>
+ <div id="profile-location-wrapper" style="display: $visitor;" >
+ <a id="profile-location" class="globe" title="$setloc" onclick="jotGetLocation();return false;"></a>
+ </div>
+ <div id="profile-nolocation-wrapper" style="display: none;" >
+ <a id="profile-nolocation" class="noglobe" title="$noloc" onclick="jotClearLocation();return false;"></a>
+ </div>
+
+ <div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
+ <a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate" title="$permset" ></a>$bang
+ </div>
+
+ <button onclick="preview_post();" id="jot-preview-link" class="button creation1">$preview</button>
+ <input type="submit" id="profile-jot-submit" class="button creation2" name="submit" value="$share" />
+
+ <div id="profile-jot-perms-end"></div>
+
+
+ <div id="profile-jot-plugin-wrapper">
+ $jotplugins
+ </div>
+
+ <div id="profile-rotator-wrapper" style="display: $visitor;" >
+ <img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+ </div>
+
+ <div id="jot-preview-content" style="display:none;"></div>
+
+ <div style="display: none;">
+ <div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
+ $acl
+ <hr style="clear:both"/>
+ <div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
+ <div id="profile-jot-email-end"></div>
+ $jotnets
+ </div>
+ </div>
+
+
+</div>
+
+<div id="profile-jot-end"></div>
+</form>
+</div>
+ {{ if $content }}<script>initEditor();</script>{{ endif }}
diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index c1eb3be5a..c497beffd 100644
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -104,20 +104,46 @@
.icon.star { background-image: url("../../../view/theme/diabook/icons/star.png");}
.icon.link { background-image: url("../../../view/theme/diabook/icons/link.png");}
.icon.lock { background-image: url("../../../view/theme/diabook/icons/lock.png");}
+.icon.unlock { background-image: url("../../../view/theme/diabook/icons/unlock.png");}
+
+.camera { background-image: url("../../../view/theme/diabook/icons/camera.png");
+ display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+ }
+.attach { background-image: url("../../../view/theme/diabook/icons/attach.png");
+ display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+ }
+.video { background-image: url("../../../view/theme/diabook/icons/video.png");
+ display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+ }
+.audio { background-image: url("../../../view/theme/diabook/icons/audio.png");
+ display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+ }
+.weblink { background-image: url("../../../view/theme/diabook/icons/weblink.png");
+ display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+ }
+.globe { background-image: url("../../../view/theme/diabook/icons/globe.png");
+ display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+ }
+.unglobe { background-image: url("../../../view/theme/diabook/icons/unglobe.png");
+ display: block; width: 28px; height: 28px; background-repeat: no-repeat;
+ }
+
+
+
.article { background-position: -50px 0px;}
-.audio { background-position: -70px 0px;}
+/*.audio { background-position: -70px 0px;}*/
.block { background-position: -90px 0px;}
/*.drop { background-position: -110px 0px;}*/
/*.drophide { background-position: -130px 0px;}*/
.edit { background-position: -150px 0px;}
-.camera { background-position: -170px 0px;}
+/*.camera { background-position: -170px 0px;}*/
/*.dislike { background-position: -190px 0px;}*/
/*.like { background-position: -210px 0px;}*/
/*.link { background-position: -230px 0px;}*/
-.globe { background-position: -50px -20px;}
-.noglobe { background-position: -70px -20px;}
+/*.globe { background-position: -50px -20px;}*/
+/*.noglobe { background-position: -70px -20px;}*/
.no { background-position: -90px -20px;}
.pause { background-position: -110px -20px;}
.play { background-position: -130px -20px;}
@@ -130,10 +156,10 @@
.tools { background-position: -50px -40px;}
/*.lock { background-position: -70px -40px;}*/
-.video { background-position: -110px -40px;}
+/*.video { background-position: -110px -40px;}*/
.youtube { background-position: -130px -40px;}
-.attach { background-position: -190px -40px;}
+/*.attach { background-position: -190px -40px;}*/
.language { background-position: -210px -40px;}
@@ -1280,9 +1306,10 @@ section {
height: 40px;
overflow: none;
width: 783px;
- background-color: #0e232e;
+ background-color: #fff;
border-bottom: 2px solid #9eabb0;
}
+
#jot #jot-tools li {
list-style: none;
float: left;
@@ -1379,7 +1406,94 @@ section {
line-height: 20px;
padding-right: 20px;
}
+#jot-perms-icon,
+#profile-location,
+#profile-nolocation,
+#profile-youtube,
+#profile-video,
+#profile-audio,
+#profile-link,
+#profile-title,
+#wall-image-upload,
+#wall-file-upload,
+#wall-image-upload-div,
+#wall-file-upload-div,
+.hover, .focus {
+ cursor: pointer;
+ margin-top: 2px;
+}
+#profile-jot-wrapper{
+ margin: 0 2em 20px 0;
+ width: 685px;
+ }
+
+#profile-jot-submit-wrapper {
+ margin-bottom: 50px;
+ width: 675px;
+}
+
+#profile-jot-submit {
+ float: left;
+}
+#profile-upload-wrapper {
+ float: left;
+
+}
+#profile-attach-wrapper {
+ float: left;
+ margin-left: 15px;
+}
+#profile-rotator {
+ float: left;
+ margin-left: 30px;
+}
+#profile-link-wrapper {
+ float: left;
+ margin-left: 15px;
+}
+#profile-youtube-wrapper {
+ float: left;
+ margin-left: 15px;
+}
+#profile-video-wrapper {
+ float: left;
+ margin-left: 15px;
+}
+#profile-audio-wrapper {
+ float: left;
+ margin-left: 15px;
+}
+#profile-location-wrapper {
+ float: left;
+ margin-left: 15px;
+}
+#profile-jot-perms {
+ float: left;
+ margin-left: 45px;
+}
+#jot-preview-link {
+ float: left;
+ margin-left: 10px;
+ margin-top: 0px !important;
+}
+
/** buttons **/
+.button.creation1 {
+ background-color: #fff;
+ border: 1px solid #777777;
+ background-image: -moz-linear-gradient(center top , white 0%, #DDDDDD 100%);
+ border-radius: 3px 3px 3px 3px;
+ box-shadow: 0 1px 1px #CFCFCF;
+}
+.button.creation2 {
+ background-color: #33ACFF;
+ background-image: -moz-linear-gradient(center top , #66C1FF 0%, #0097FF 100%);
+ border: 1px solid #777777;
+ color: white;
+ border-radius: 3px 3px 3px 3px;
+ box-shadow: 0 1px 1px #CFCFCF;
+ margin-left: 5px;
+}
/*input[type="submit"] {
border: 0px;
background-color: @ButtonBackgroundColor;