Fix a bug where the convos page would 404.
Friendly message when there are no convos. Fix the convo input css. Hide elapsed on mobile for Nox. Added convos_none phrase.
This commit is contained in:
parent
3798838ece
commit
84cd10a8c9
|
@ -1,6 +1,6 @@
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import "github.com/Azareal/Gosora/query_gen"
|
import qgen "github.com/Azareal/Gosora/query_gen"
|
||||||
|
|
||||||
var mysqlPre = "utf8mb4"
|
var mysqlPre = "utf8mb4"
|
||||||
var mysqlCol = "utf8mb4_general_ci"
|
var mysqlCol = "utf8mb4_general_ci"
|
||||||
|
@ -418,6 +418,15 @@ func createTables(adapter qgen.Adapter) (err error) {
|
||||||
}, nil,
|
}, nil,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
/*
|
||||||
|
createTable("users_blocks", "", "",
|
||||||
|
[]tC{
|
||||||
|
tC{"blocker", "int", 0, false, false, ""},
|
||||||
|
tC{"uid", "int", 0, false, false, ""},
|
||||||
|
}, nil,
|
||||||
|
)
|
||||||
|
*/
|
||||||
|
|
||||||
createTable("activity_stream_matches", "", "",
|
createTable("activity_stream_matches", "", "",
|
||||||
[]tC{
|
[]tC{
|
||||||
tC{"watcher", "int", 0, false, false, ""}, // TODO: Make this a foreign key
|
tC{"watcher", "int", 0, false, false, ""}, // TODO: Make this a foreign key
|
||||||
|
|
|
@ -537,6 +537,7 @@
|
||||||
|
|
||||||
"convos_head":"Conversations",
|
"convos_head":"Conversations",
|
||||||
"convos_create":"Create Convo",
|
"convos_create":"Create Convo",
|
||||||
|
"convos_none":"You don't have any conversations yet.",
|
||||||
"convo_head":"Conversation",
|
"convo_head":"Conversation",
|
||||||
"convo_users":"Participants",
|
"convo_users":"Participants",
|
||||||
"create_convo_head":"Create Conversation",
|
"create_convo_head":"Create Conversation",
|
||||||
|
|
|
@ -25,9 +25,7 @@ func Convos(w http.ResponseWriter, r *http.Request, user c.User, h *c.Header) c.
|
||||||
|
|
||||||
convos, err := c.Convos.GetUserExtra(user.ID, offset)
|
convos, err := c.Convos.GetUserExtra(user.ID, offset)
|
||||||
//log.Printf("convos: %+v\n", convos)
|
//log.Printf("convos: %+v\n", convos)
|
||||||
if err == sql.ErrNoRows {
|
if err != sql.ErrNoRows && err != nil {
|
||||||
return c.NotFound(w, r, h)
|
|
||||||
} else if err != nil {
|
|
||||||
return c.InternalError(err, w, r)
|
return c.InternalError(err, w, r)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -31,6 +31,8 @@
|
||||||
</span>
|
</span>
|
||||||
<span title="{{abstime .LastReplyAt}}" class="to_right">{{reltime .LastReplyAt}}</span>
|
<span title="{{abstime .LastReplyAt}}" class="to_right">{{reltime .LastReplyAt}}</span>
|
||||||
<div style="clear:both;"></div>
|
<div style="clear:both;"></div>
|
||||||
</div>{{end}}
|
</div>{{else}}
|
||||||
|
<div class="rowitem">{{lang "convos_none"}}</div>
|
||||||
|
{{end}}
|
||||||
</div>
|
</div>
|
||||||
{{template "paginator.html" . }}
|
{{template "paginator.html" . }}
|
|
@ -55,3 +55,13 @@
|
||||||
.content_column {
|
.content_column {
|
||||||
margin-top: 5px;
|
margin-top: 5px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.topic_reply_form {
|
||||||
|
margin-top: 8px;
|
||||||
|
padding: 12px;
|
||||||
|
}
|
||||||
|
.input_content {
|
||||||
|
width: 100%;
|
||||||
|
height: 100px;
|
||||||
|
resize: vertical;
|
||||||
|
}
|
|
@ -1415,6 +1415,9 @@ input[type=checkbox]:checked + label .sel {
|
||||||
font-size: 17px;
|
font-size: 17px;
|
||||||
line-height: 28px;
|
line-height: 28px;
|
||||||
}
|
}
|
||||||
|
.elapsed {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@media(min-width: 751px) {
|
@media(min-width: 751px) {
|
||||||
|
|
Loading…
Reference in New Issue