diff options
| author | Thomas Willingham <founder@kakste.com> | 2013-03-14 22:50:30 +0000 |
|---|---|---|
| committer | Thomas Willingham <founder@kakste.com> | 2013-03-14 22:50:30 +0000 |
| commit | d07971b909363dd82faee3e4b5a218cb21d376dc (patch) | |
| tree | 1d4b76c4ed24bf3c8cbb81c73069eb8ab4b2644c /view/tpl | |
| parent | fbc5260995866c280fbc48bfb7899836f46136f4 (diff) | |
| parent | ffcba3db81d85ae8bdc56f1772c7675aef56c78e (diff) | |
| download | volse-hubzilla-d07971b909363dd82faee3e4b5a218cb21d376dc.tar.gz volse-hubzilla-d07971b909363dd82faee3e4b5a218cb21d376dc.tar.bz2 volse-hubzilla-d07971b909363dd82faee3e4b5a218cb21d376dc.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
view/theme/redbasic/css/style.css
Diffstat (limited to 'view/tpl')
| -rw-r--r-- | view/tpl/jot-header.tpl | 18 | ||||
| -rw-r--r-- | view/tpl/jot.tpl | 5 | ||||
| -rw-r--r-- | view/tpl/photo_albums.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/smarty3/jot-header.tpl | 18 | ||||
| -rw-r--r-- | view/tpl/smarty3/jot.tpl | 5 | ||||
| -rw-r--r-- | view/tpl/smarty3/photo_albums.tpl | 2 |
6 files changed, 2 insertions, 48 deletions
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index e4fb00b7a..700a815cf 100644 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -74,24 +74,6 @@ function initEditor(cb){ $('#profile-jot-desc').html(' '); } - //Character count - - if(textlen <= 140) { - $('#character-counter').removeClass('red'); - $('#character-counter').removeClass('orange'); - $('#character-counter').addClass('grey'); - } - if((textlen > 140) && (textlen <= 420)) { - $('#character-counter').removeClass('grey'); - $('#character-counter').removeClass('red'); - $('#character-counter').addClass('orange'); - } - if(textlen > 420) { - $('#character-counter').removeClass('grey'); - $('#character-counter').removeClass('orange'); - $('#character-counter').addClass('red'); - } - $('#character-counter').text(textlen); }); ed.onInit.add(function(ed) { diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 84b6df679..a50d40eca 100644 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -1,10 +1,5 @@ <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" /> diff --git a/view/tpl/photo_albums.tpl b/view/tpl/photo_albums.tpl index eccc3660a..a2e305df5 100644 --- a/view/tpl/photo_albums.tpl +++ b/view/tpl/photo_albums.tpl @@ -3,7 +3,7 @@ {{ if $albums }} <ul> {{ for $albums as $al }} -<li><a href="$baseurl/photos/$nick/$al.bin2hex">$al.album</a></li> +<li><a href="$baseurl/photos/$nick/album/$al.bin2hex">$al.album</a></li> {{ endfor }} </ul> {{ endif }} diff --git a/view/tpl/smarty3/jot-header.tpl b/view/tpl/smarty3/jot-header.tpl index c20c7c10d..cce83e30b 100644 --- a/view/tpl/smarty3/jot-header.tpl +++ b/view/tpl/smarty3/jot-header.tpl @@ -79,24 +79,6 @@ function initEditor(cb){ $('#profile-jot-desc').html(' '); } - //Character count - - if(textlen <= 140) { - $('#character-counter').removeClass('red'); - $('#character-counter').removeClass('orange'); - $('#character-counter').addClass('grey'); - } - if((textlen > 140) && (textlen <= 420)) { - $('#character-counter').removeClass('grey'); - $('#character-counter').removeClass('red'); - $('#character-counter').addClass('orange'); - } - if(textlen > 420) { - $('#character-counter').removeClass('grey'); - $('#character-counter').removeClass('orange'); - $('#character-counter').addClass('red'); - } - $('#character-counter').text(textlen); }); ed.onInit.add(function(ed) { diff --git a/view/tpl/smarty3/jot.tpl b/view/tpl/smarty3/jot.tpl index 2def156b2..4f52cff20 100644 --- a/view/tpl/smarty3/jot.tpl +++ b/view/tpl/smarty3/jot.tpl @@ -5,11 +5,6 @@ *}} <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}}" /> diff --git a/view/tpl/smarty3/photo_albums.tpl b/view/tpl/smarty3/photo_albums.tpl index 8a31e030c..b74c73fd3 100644 --- a/view/tpl/smarty3/photo_albums.tpl +++ b/view/tpl/smarty3/photo_albums.tpl @@ -8,7 +8,7 @@ {{if $albums}} <ul> {{foreach $albums as $al}} -<li><a href="{{$baseurl}}/photos/{{$nick}}/{{$al.bin2hex}}">{{$al.album}}</a></li> +<li><a href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}">{{$al.album}}</a></li> {{/foreach}} </ul> {{/if}} |