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

Dev #507

Merged
merged 14 commits into from
Feb 4, 2025
Merged

Dev #507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
0981fcf
update
Lungsangg Feb 4, 2025
699c43a
button_color_changed_to_red
Lungsangg Feb 4, 2025
d5f4b46
Merge branch 'dev' of https://github.com/OpenPecha/Pecha.org into dev
Lungsangg Feb 4, 2025
970bb39
fixed complex commentary list
lobsam Feb 4, 2025
0d5932a
add added sanskrit localization
lobsam Feb 3, 2025
5c8d9b7
small change
lobsam Feb 4, 2025
cb8474b
Merge branch 'dev' into fix_complext_commentary_list_display
lobsam Feb 4, 2025
4bc7e5f
Fix complext commentary list display (#503)
lobsam Feb 4, 2025
06114e6
fixed commentery list
lobsam Feb 4, 2025
659445c
fixed commentery list (#504)
lobsam Feb 4, 2025
077a1d9
button_color_update
Lungsangg Feb 4, 2025
3f09fad
Merge branch 'dev' into chore/navigate_back
Lungsangg Feb 4, 2025
782b639
Chore/navigate back (#506)
Lungsangg Feb 4, 2025
cb55754
navigation_back_button_update
Lungsangg Feb 4, 2025
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
8 changes: 4 additions & 4 deletions static/css/s2.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ a, a:hover {
--miscelaneous-green: #3B5849;
--selected-option: #000000;
--select-blue: #0B71E7;
--pecha-red: #b5343c;
--pecha-red: #C39F48;
--highlight-red: #cc7273;
--highlight-red-light: #eccbcc;
--inline-link-red: #cc5454;
Expand Down Expand Up @@ -11256,7 +11256,7 @@ body #keyboardInputMaster tbody tr td table tbody tr td.pressed {
padding: 5px 10px;
font-size: 12px;
font-family: Cambria, Cochin, Georgia, Times, 'Times New Roman', serif;
background-color: #b84045;
background-color: #C39F48;
color: white;
border: var(--talmud-gold) 1px solid;
border-radius: 5px;
Expand Down Expand Up @@ -13478,7 +13478,7 @@ section.SheetSource .SheetOutsideBiText {

.resourcesLink.blue {
color: white;
background-color: #18345d;
background-color: #C39F48;
}

.resourcesLink.blue img {
Expand Down Expand Up @@ -14590,7 +14590,7 @@ body .homeFeedWrapper.userStats {
}

.userStatModeButton.active {
background-color: #19365d;
background-color: #C39F48;
color: #fff;
}

Expand Down
2 changes: 1 addition & 1 deletion static/js/NotificationsPanel.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ const FollowNotification = ({date, content}) => {
const topLine = (
<>
<a href={content.profileUrl}>{content.name}</a>&nbsp;
<InterfaceText>notifcation.is_following_you"</InterfaceText>
<InterfaceText>notifcation.is_following_you</InterfaceText>
</>
);

Expand Down
1 change: 0 additions & 1 deletion static/js/ReaderPanel.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,7 +635,6 @@ class ReaderPanel extends Component {
}

render() {
console.log("book ref:",Sefaria.index(this.state.bookRef))
if (this.state.error) {
return (
<div
Expand Down
5 changes: 3 additions & 2 deletions static/js/TextList.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ class TextList extends Component {
var commentator = filter[0];
var basetext = this.getSectionRef();
var commentarySection = Sefaria.commentarySectionRef(commentator, basetext);
console.log("commentary text,, ", commentator, basetext, commentarySection);
if (!commentarySection) {
this.setState({waitForText: false});
return;
Expand Down Expand Up @@ -199,15 +200,15 @@ class TextList extends Component {
var displayFilter = filter.map(filter => filter.split("|")[0]); // Remove filterSuffix for display
var links = this.getLinks();


// this.state.waitForText && !this.state.textLoaded
var enText = filter.length ? displayFilter.join(", "): ""
var en = Sefaria._('text.message.no_connection', {text: enText});
var heText = displayFilter.map(f => Sefaria.hebrewTerm(f)).join(", ") == "Commentary" ? Sefaria._('text.commentary') : displayFilter.map(f => Sefaria.hebrewTerm(f)).join(", ")
var he = Sefaria._('text.message.no_connection', {text: heText});
var noResultsMessage = <LoadingMessage message={en} heMessage={he} />;
var message = !this.state.linksLoaded ? (<LoadingMessage />) : (links.length === 0 ? noResultsMessage : null);
var content = links.length === 0 ? message :
this.state.waitForText && !this.state.textLoaded ?
this.state.waitForText && this.state.textLoaded ?
(<LoadingMessage />) :
links.map(function(link, i) {
if (link.isSheet) {
Expand Down