Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Shortened titles #401

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Shortened titles #401

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
86ff213
Added Abbreviations and Ellispis-Based Truncation
HeadMerchant Mar 5, 2020
cd1371b
Removed Dependence on vue-line-clamp
HeadMerchant Apr 9, 2020
221828c
Smart Truncation
HeadMerchant Apr 10, 2020
93ad3ba
Suggest changes to abbreviations
MaximoMachado Apr 10, 2020
6c54f94
Abbreviation changes
HeadMerchant Apr 10, 2020
0a9cc99
Merge branch 'shortened-titles' of https://github.com/sipb/courseroad…
HeadMerchant Apr 10, 2020
eb71773
Suggestions for abbreviation changes
miriam-rittenberg Apr 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"ua-parser-js": "^0.7.19",
"vue-context": "^3.4.0",
"vue-cookies": "^1.5.12",
"vue-line-clamp": "^1.3.2",
"vue-router": "^3.0.4",
"vue-scrolling-table": "^0.2.2",
"vuetify": "^1.5.12",
Expand Down
42 changes: 35 additions & 7 deletions src/components/Class.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,16 @@
<v-icon style="margin: 4px" small @click="$store.commit('removeClass', {classInfo: classInfo, classIndex: classIndex}); $event.stopPropagation();">
cancel
</v-icon>
<v-card-text class="card-text">
<span style="font-weight: bold; font-size: 1.1em;">{{ classInfo.id }}</span> {{ classInfo.title }}
<v-card-text ref="title" v-line-clamp:20="3" class="card-text">
<span style="font-weight: bold; font-size: 1.1em;">{{ classInfo.id }}</span> {{ useShortenedTitle ? shortenedTitle : classInfo.title }}
</v-card-text>
</div>
</v-card>
<v-btn v-if="warnings.length>0&&(!classInfo.overrideWarnings||hover)" slot="badge" icon @click="warningDialog = true">
<!--<v-btn v-if="warnings.length>0&&(!classInfo.overrideWarnings||hover)" slot="badge" icon @click="warningDialog = true">
<v-icon medium>
warning
</v-icon>
</v-btn>
</v-btn>-->
</v-badge>
</v-hover>
<v-dialog v-model="warningDialog" max-width="600">
Expand Down Expand Up @@ -74,6 +74,11 @@

<script>
import colorMixin from './../mixins/colorMixin.js';
import { abbreviations, nonAbbreviator } from './../utils/abbreviations.js';
import Vue from 'vue';
import VueLineClamp from './../utils/vue-line-clamp.js';

Vue.use(VueLineClamp);
HeadMerchant marked this conversation as resolved.
Show resolved Hide resolved

export default {
name: 'Class',
Expand All @@ -99,9 +104,32 @@ export default {
data () {
return {
warningDialog: false,
shouldOverrideWarnings: this.classInfo.overrideWarnings
shouldOverrideWarnings: this.classInfo.overrideWarnings,
useShortenedTitle: false
HeadMerchant marked this conversation as resolved.
Show resolved Hide resolved
};
},
computed: {
shortenedTitle: function () {
var title = this.classInfo.title.split(/([^A-Za-z])/);// Keep separators
var words = [];
for (const word of title) {
const lookup = word.toLowerCase();
var abbr = abbreviations[lookup];
if (abbr) {
var abbrevChar = '.';
if (abbr.startsWith(nonAbbreviator)) {
abbr = abbr.substring(nonAbbreviator.length);
abbrevChar = '';
}
// Match capitalization
words.push((word.charAt(0) === lookup.charAt(0) ? abbr : abbr.charAt(0).toUpperCase() + abbr.slice(1)) + abbrevChar);
} else {
words.push(word);
}
}
return words.join('');
}
},
methods: {
dragStart: function (event) {
event.dataTransfer.setData('classData', JSON.stringify({ isNew: false, classInfo: this.classInfo, classIndex: this.classIndex }));
Expand Down Expand Up @@ -131,14 +159,14 @@ export default {
padding: 0;
margin: .2em .4em 0em .2em;
height: 100%;
overflow: hidden;
}

.classbox {
display: flex;
align-items: flex-start;
height: 5.8em; /* Chosen for three lines in the card, working with the set padding and margins. */
overflow: hidden;
padding: .2em .4em .4em .2em;
padding: .2em .4em .5em .2em;
/* Multi-line truncation is not a supported feature of CSS right now.
Optimally, we would have multi-line truncation within the cards, but
currently extra words are clipped.
Expand Down
Loading