diff options
author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-03 08:05:53 -0500 |
---|---|---|
committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-03 08:05:53 -0500 |
commit | ba284044707e0f66fed98c711b9262bd623a0d42 (patch) | |
tree | 8f9bfbf8047d65ef8691b9353d1124aeed765129 /view/theme/diabook | |
parent | 7ef861907e32cd3d01877c0fdf8e2544f4f659b1 (diff) | |
parent | 8ffe15fbb1290fac839189f2de337efec223c5e1 (diff) | |
download | volse-hubzilla-ba284044707e0f66fed98c711b9262bd623a0d42.tar.gz volse-hubzilla-ba284044707e0f66fed98c711b9262bd623a0d42.tar.bz2 volse-hubzilla-ba284044707e0f66fed98c711b9262bd623a0d42.zip |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
fix text-editor in theme
german strings as of 28th Feb from transilex
small fix in style.css
fix star/unstar
fixes in wall_item.tpl and style.css in theme diabook
fix in wall_item.tpl new icon link.png
add diabook to default themes
fixed broken tags and notifications in theme
* master:
Diffstat (limited to 'view/theme/diabook')
-rwxr-xr-x | view/theme/diabook/icons/attach.png | bin | 0 -> 862 bytes | |||
-rwxr-xr-x | view/theme/diabook/icons/audio.png | bin | 0 -> 655 bytes | |||
-rwxr-xr-x | view/theme/diabook/icons/camera.png | bin | 0 -> 568 bytes | |||
-rwxr-xr-x | view/theme/diabook/icons/globe.png | bin | 0 -> 680 bytes | |||
-rwxr-xr-x | view/theme/diabook/icons/link.png | bin | 0 -> 365 bytes | |||
-rwxr-xr-x | view/theme/diabook/icons/lock.png | bin | 0 -> 313 bytes | |||
-rwxr-xr-x | view/theme/diabook/icons/star.png | bin | 358 -> 339 bytes | |||
-rwxr-xr-x | view/theme/diabook/icons/unglobe.png | bin | 0 -> 659 bytes | |||
-rwxr-xr-x | view/theme/diabook/icons/unlock.png | bin | 0 -> 314 bytes | |||
-rwxr-xr-x | view/theme/diabook/icons/unstarred.png | bin | 339 -> 358 bytes | |||
-rwxr-xr-x | view/theme/diabook/icons/video.png | bin | 0 -> 373 bytes | |||
-rwxr-xr-x | view/theme/diabook/icons/weblink.png | bin | 0 -> 305 bytes | |||
-rwxr-xr-x | view/theme/diabook/jot.tpl | 83 | ||||
-rw-r--r-- | view/theme/diabook/nav.tpl | 34 | ||||
-rw-r--r-- | view/theme/diabook/style.css | 160 | ||||
-rw-r--r-- | view/theme/diabook/wall_item.tpl | 25 |
16 files changed, 260 insertions, 42 deletions
diff --git a/view/theme/diabook/icons/attach.png b/view/theme/diabook/icons/attach.png Binary files differnew file mode 100755 index 000000000..4412d94a5 --- /dev/null +++ b/view/theme/diabook/icons/attach.png diff --git a/view/theme/diabook/icons/audio.png b/view/theme/diabook/icons/audio.png Binary files differnew file mode 100755 index 000000000..075e04734 --- /dev/null +++ b/view/theme/diabook/icons/audio.png diff --git a/view/theme/diabook/icons/camera.png b/view/theme/diabook/icons/camera.png Binary files differnew file mode 100755 index 000000000..8769cc82f --- /dev/null +++ b/view/theme/diabook/icons/camera.png diff --git a/view/theme/diabook/icons/globe.png b/view/theme/diabook/icons/globe.png Binary files differnew file mode 100755 index 000000000..daec0c256 --- /dev/null +++ b/view/theme/diabook/icons/globe.png diff --git a/view/theme/diabook/icons/link.png b/view/theme/diabook/icons/link.png Binary files differnew file mode 100755 index 000000000..0ef666a67 --- /dev/null +++ b/view/theme/diabook/icons/link.png diff --git a/view/theme/diabook/icons/lock.png b/view/theme/diabook/icons/lock.png Binary files differnew file mode 100755 index 000000000..e00c5b2a2 --- /dev/null +++ b/view/theme/diabook/icons/lock.png diff --git a/view/theme/diabook/icons/star.png b/view/theme/diabook/icons/star.png Binary files differindex ca2072414..32eff5a50 100755 --- a/view/theme/diabook/icons/star.png +++ b/view/theme/diabook/icons/star.png diff --git a/view/theme/diabook/icons/unglobe.png b/view/theme/diabook/icons/unglobe.png Binary files differnew file mode 100755 index 000000000..ddcdfa23c --- /dev/null +++ b/view/theme/diabook/icons/unglobe.png diff --git a/view/theme/diabook/icons/unlock.png b/view/theme/diabook/icons/unlock.png Binary files differnew file mode 100755 index 000000000..3d6543087 --- /dev/null +++ b/view/theme/diabook/icons/unlock.png diff --git a/view/theme/diabook/icons/unstarred.png b/view/theme/diabook/icons/unstarred.png Binary files differindex 32eff5a50..ca2072414 100755 --- a/view/theme/diabook/icons/unstarred.png +++ b/view/theme/diabook/icons/unstarred.png diff --git a/view/theme/diabook/icons/video.png b/view/theme/diabook/icons/video.png Binary files differnew file mode 100755 index 000000000..c9a905e32 --- /dev/null +++ b/view/theme/diabook/icons/video.png diff --git a/view/theme/diabook/icons/weblink.png b/view/theme/diabook/icons/weblink.png Binary files differnew file mode 100755 index 000000000..45c471e6c --- /dev/null +++ b/view/theme/diabook/icons/weblink.png 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" > </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/nav.tpl b/view/theme/diabook/nav.tpl index 80240f4ae..17df8e652 100644 --- a/view/theme/diabook/nav.tpl +++ b/view/theme/diabook/nav.tpl @@ -1,5 +1,5 @@ <header> - {# $langselector #} + {# $langselector version 0.01#} <div id="site-location">$sitelocation</div> <div id="banner">$banner</div> @@ -18,7 +18,7 @@ </li> {{ endif }} - + {{ if $nav.contacts }} <li class="nav-menu-icon" id="nav-contacts-linkmenu"> <a href="$nav.contacts.0" rel="#nav-contacts-menu" title="$nav.contacts.1"> <span class="icon contacts">$nav.contacts.1</span></a> @@ -28,9 +28,9 @@ <li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li> </ul> </li> + {{ endif }} - - + {{ if $nav.messages }} <li id="nav-messages-linkmenu" class="nav-menu-icon"> <a href="$nav.messages.0" rel="#nav-messages-menu" title="$nav.messages.1"> <span class="icon messages">$nav.messages.1</span></a> @@ -42,9 +42,8 @@ <li id="nav-messages-new"><a href="message/new">Neue Nachricht</a></li> </ul> </li> + {{ endif }} - - {{ if $nav.notifications }} <li id="nav-notifications-linkmenu" class="nav-menu-icon"><a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1"><span class="icon notify">$nav.notifications.1</span></a> <span id="notify-update" class="nav-notify"></span> @@ -54,9 +53,7 @@ <li class="empty">$emptynotifications</li> </ul> </li> - {{ endif }} - - + {{ endif }} <li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a> <ul id="nav-site-menu" class="menu-popup"> @@ -70,16 +67,17 @@ {{ if $nav.admin }}<li><a class="$nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>{{ endif }} {{ if $nav.logout }}<li><a class="menu-sep $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>{{ endif }} - {{ if $nav.login }}<li><a class="$nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a><li>{{ endif }} + </ul> </li> - + {{ if $nav.directory }} <li id="nav-directory-link" class="nav-menu $sel.directory"> <a class="$nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a> </li> + {{ endif }} {{ if $nav.apps }} <li id="nav-apps-link" class="nav-menu $sel.apps"> @@ -113,14 +111,22 @@ </li> {{ endif }} + {{ if $nav.login }} + <li id="nav-home-link" class="nav-menu $sel.home"> + <a class="$nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> + <li> + {{ endif }} + - </ul> - </div> + </ul> </nav> + + + <ul id="nav-notifications-template" style="display:none;" rel="template"> - <li><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li> + <li class="{4}"><a href="{0}"><img src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li> </ul> {# diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index 383fba24d..c497beffd 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -102,20 +102,48 @@ .icon.tagged { background-image: url("../../../view/theme/diabook/icons/tagged.png");} .icon.unstarred { background-image: url("../../../view/theme/diabook/icons/unstarred.png");} .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;} +/*.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;} @@ -126,12 +154,12 @@ .share { background-position: -230px -20px;} .tools { background-position: -50px -40px;} -.lock { background-position: -70px -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;} @@ -160,7 +188,7 @@ display: block; width: 20px; height: 20px; - background-image: url('icons.png'); + /*background-image: url('icons.png');*/ } .icon { @@ -346,7 +374,9 @@ body { font-size: 13px; background-color: #ffffff; color: #2d2d2d; - margin: 50px 0px 0px 0px; + margin-left: : auto; + margin-right: auto; + margin-top: 50px; display: table; } h4 { @@ -613,7 +643,7 @@ nav .nav-notify { border-radius: 5px 5px 5px 5px; font-size: 10px; font-weight: 900; - padding: 1px 3px; + padding: 1px 4px; top: 0px; right: -6px; min-width: 10px; @@ -673,6 +703,10 @@ nav #nav-apps-link.selected { padding: 5px 10px; */ } +.notify-seen { + background: none repeat scroll 0 0 #DDDDDD; + } + ul.menu-popup { position: absolute; display: none; @@ -1162,15 +1196,15 @@ section { padding-bottom: 2px; } .tag { - background: url("../../../images/tag_b.png") repeat-x center left; - color: #ffffff; + /*background: url("../../../images/tag_b.png") repeat-x center left;*/ + color: #3465A4; padding-left: 3px; - font-size: 10px; + font-size: 12px; } .tag a { - padding-right: 8px; - background: url("../../../images/tag.png") no-repeat center right; - color: #ffffff; + padding-right: 5px; + /*background: url("../../../images/tag.png") no-repeat center right;*/ + color: #3465A4; } .wwto { position: absolute !important; @@ -1263,6 +1297,8 @@ section { color: #999999; border: 1px solid #DDD; padding: 0.3em; + margin-top: 30px; + margin-bottom: 10px; } #jot #jot-tools { margin: 0px; @@ -1270,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; @@ -1369,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; diff --git a/view/theme/diabook/wall_item.tpl b/view/theme/diabook/wall_item.tpl index 1f1a878b4..10d395316 100644 --- a/view/theme/diabook/wall_item.tpl +++ b/view/theme/diabook/wall_item.tpl @@ -5,6 +5,9 @@ <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" /> </div> {{ endif }} + + + <div class="wall-item-container $item.indent"> <div class="wall-item-item"> <div class="wall-item-info"> @@ -36,26 +39,21 @@ </div> <div class="wall-item-bottom"> <div class="wall-item-links"> + {{ if $item.plink }}<a class="icon link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }} </div> <div class="wall-item-tags"> - {{ for $item.tags as $item.tag }} - <span class='tag'>$item.tag</span> + {{ for $item.tags as $tag }} + <span class='tag'>$tag</span> {{ endfor }} </div> </div> <div class="wall-item-bottom"> <div class=""> - {{ if $item.plink }}<a class="icon s16 link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }} + </div> <div class="wall-item-actions"> <div class="wall-item-location">$item.location </div> <div class="wall-item-actions-social"> - - {{ if $item.star }} - <a href="#" id="star-$item.id" class="icon unstarred" onclick="dostar($item.id); return false;" class="$item.star.classdo" title="$item.star.do">$item.star.do</a> - <a href="#" id="unstar-$item.id" class="icon star" onclick="dostar($item.id); return false;" class="$item.star.classundo" title="$item.star.undo">$item.star.undo</a> - <a href="#" id="tagger-$item.id" class="icon tagged" onclick="itemTag($item.id); return false;" class="$item.star.classtagger" title="$item.star.tagger">$item.star.tagger</a> - {{ endif }} {{ if $item.vote }} <a href="#" id="like-$item.id" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a> @@ -64,7 +62,14 @@ {{ if $item.vote.share }} <a href="#" id="share-$item.id" class="icon recycle" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a> - {{ endif }} + {{ endif }} + + {{ if $item.star }} + <a href="#" id="star-$item.id" class="icon star" onclick="dostar($item.id); return false;" class="$item.star.classdo" title="$item.star.do">$item.star.do</a> + <a href="#" id="unstar-$item.id" class="icon unstarred" onclick="dostar($item.id); return false;" class="$item.star.classundo" title="$item.star.undo">$item.star.undo</a> + <a href="#" id="tagger-$item.id" class="icon tagged" onclick="itemTag($item.id); return false;" class="$item.star.classtagger" title="$item.star.tagger">$item.star.tagger</a> + {{ endif }} + </div> <div class="wall-item-actions-tools"> |