{{$name}} | +{{$name}} | +{{$descr}} | @@ -35,6 +36,9 @@ {{$item.title}} {{/if}} + | + {{$item.descr}} + | {{if $edit}} |
---|
diff --git a/include/conversation.php b/include/conversation.php index 42ce140a6..8c9029a43 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1199,7 +1199,7 @@ function status_editor($a, $x, $popup = false) { '$noloc' => ((get_pconfig($x['profile_uid'], 'system', 'use_browser_location')) ? t('Clear browser location') : ''), '$shortnoloc' => t('clear location'), '$title' => ((x($x, 'title')) ? htmlspecialchars($x['title'], ENT_COMPAT,'UTF-8') : ''), - '$placeholdertitle' => t('Title (optional)'), + '$placeholdertitle' => ((x($x, 'placeholdertitle')) ? $x['placeholdertitle'] : t('Title (optional)')), '$hidetitle' => ((x($x, 'hidetitle')) ? $x['hidetitle'] : false), '$catsenabled' => ((feature_enabled($x['profile_uid'], 'categories') && (! $webpage)) ? 'categories' : ''), '$category' => "", diff --git a/mod/layouts.php b/mod/layouts.php index 57300777a..b1e4cd345 100644 --- a/mod/layouts.php +++ b/mod/layouts.php @@ -120,7 +120,8 @@ function layouts_content(&$a) { 'nopreview' => 1, 'ptlabel' => t('Layout Name'), 'profile_uid' => intval($owner), - 'expanded' => true + 'expanded' => true, + 'placeholdertitle' => t('Layout Description') ); if($_REQUEST['title']) @@ -154,7 +155,8 @@ function layouts_content(&$a) { ); $pages[$rr['iid']][] = array( 'url' => $rr['iid'], - 'title' => $rr['sid'], + 'title' => $rr['sid'], + 'descr' => $rr['title'], 'mid' => $rr['mid'], 'created' => $rr['created'], 'edited' => $rr['edited'], @@ -173,6 +175,7 @@ function layouts_content(&$a) { '$editor' => $editor, '$baseurl' => $url, '$name' => t('Layout Name'), + '$descr' => t('Layout Description'), '$created' => t('Created'), '$edited' => t('Edited'), '$edit' => t('Edit'), diff --git a/view/css/mod_layouts.css b/view/css/mod_layouts.css index 5a3c86733..8e0a945bf 100644 --- a/view/css/mod_layouts.css +++ b/view/css/mod_layouts.css @@ -15,14 +15,18 @@ padding: 7px 3px 7px 10px; } -#layout-list-table th:nth-child(5), -#layout-list-table td:nth-child(5){ - padding: 7px 3px; +#layout-list-table th:nth-child(2){ white-space: nowrap; } #layout-list-table th:nth-child(6), #layout-list-table td:nth-child(6){ + padding: 7px 3px; + white-space: nowrap; +} + +#layout-list-table th:nth-child(7), +#layout-list-table td:nth-child(7){ padding: 7px 10px 7px 7px; white-space: nowrap; } diff --git a/view/tpl/layoutlist.tpl b/view/tpl/layoutlist.tpl index 6812cf95b..ab7408eae 100644 --- a/view/tpl/layoutlist.tpl +++ b/view/tpl/layoutlist.tpl @@ -18,7 +18,8 @@