variable cleanup, more consistent button placement

diff --git a/db_channel.sh b/db_channel.sh
index 15334815da8c8cf841ccdb30cf1f1ed796d8ebf7..1df83feeb58b2826de88848d4f40e9b62cc2f807 100755 (executable)
--- a/db_channel.sh
+++ b/db_channel.sh
@@ -7,14 +7,18 @@ include_dbchannel="$0"
 # ID   NAME    DESCRIPTION     LOGO    THEME   AUTHORS DESCR_CACHE FUTUREUSE
 
 # == GLOBALS ==
-unset CHANNEL_ID CHANNEL_NAME CHANNEL_DESCRIPTION CHANNEL_LOGO CHANNEL_THEME \
-      CHANNEL_AUTHORS CHANNEL_DESCR_CACHE CHANNEL_FUTUREUSE
+UNSET_CHANNEL='unset \
+  CHANNEL_ID CHANNEL_NAME CHANNEL_DESCRIPTION CHANNEL_LOGO CHANNEL_THEME \
+  CHANNEL_AUTHORS CHANNEL_DESCR_CACHE CHANNEL_FUTUREUSE
+'
 
 LOCAL_CHANNEL='local \
   CHANNEL_ID CHANNEL_NAME CHANNEL_DESCRIPTION CHANNEL_LOGO CHANNEL_THEME \
   CHANNEL_AUTHORS CHANNEL_DESCR_CACHE CHANNEL_FUTUREUSE
 '
 
+eval "$UNSET_CHANNEL"
+
 chan_db="$_DATA/channels.db"
 
 read_channel() {
@@ -42,9 +46,7 @@ read_channel() {
         CHANNEL_AUTHORS="$(UNSTRING "$CHANNEL_AUTHORS")"
     CHANNEL_DESCR_CACHE="$(UNSTRING "$CHANNEL_DESCR_CACHE")"
   else
-    unset CHANNEL_ID CHANNEL_NAME CHANNEL_DESCRIPTION CHANNEL_LOGO \
-          CHANNEL_THEME CHANNEL_AUTHORS CHANNEL_DESCR_CACHE \
-          CHANNEL_FUTUREUSE
+    eval "$UNSET_CHANNEL"
     return 1
   fi
 }

diff --git a/page_channel.sh b/page_channel.sh
index 1720276c3df252e7a1eb3423a63036e5fffc4ece..f2d073843bc54c6dfbca78001ab53e0dcfd8949f 100755 (executable)
--- a/page_channel.sh
+++ b/page_channel.sh
@@ -73,11 +73,10 @@ if [ "$CHANNEL_ID" -a "$action" = edit ]; then
 elif [ "$CHANNEL_ID" ]; then
   vid_db="$_DATA/$CHANNEL_ID/videos.db"
   yield_page "$CHANNEL_NAME" "channel" <<-EOF
-       [nav [a href="../" Channels] - [span $(HTML "${CHANNEL_NAME:-(Unnamed Channel)}")]
-         $(AUTHOR && printf ' - [a href="edit" edit]')
-       ]
+       [nav [a href="../" Channels] - [span $(HTML "${CHANNEL_NAME:-(Unnamed Channel)}")]]
        [h1 .name $(HTML "$CHANNEL_NAME")]
        [div .description . ${CHANNEL_DESCR_CACHE}]
+       $(AUTHOR && printf '[a .button href="edit" edit]')
        [h1 .videos Videos]
        [div .videos . $(
          AUTHOR && printf '