Skip to content

Commit 025fb31

Browse files
committed
Welcome screen changes
1 parent ebbaf01 commit 025fb31

3 files changed

Lines changed: 33 additions & 6 deletions

File tree

activity_browser/__main__.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,15 +97,14 @@ def load_layout(self):
9797

9898
self.load_settings()
9999

100-
application.main_window.sync()
101-
102100
def load_settings(self):
103101
self.text_label.setText("Loading project")
104102
thread = SettingsThread(self)
105103
thread.finished.connect(self.load_finished)
106104
thread.start()
107105

108106
def load_finished(self):
107+
application.main_window.sync()
109108
application.main_window.show()
110109
self.deleteLater()
111110

activity_browser/layouts/panes/databases.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ def build_df(self) -> pd.DataFrame:
8181
dt = datetime.datetime.strptime(dt, "%Y-%m-%dT%H:%M:%S.%f")
8282

8383
# final column includes interactive checkbox which shows read-only state of db
84-
database_read_only = project_settings.db_is_readonly(name)
8584
data.append(
8685
{
8786
"name": name,

activity_browser/static/startscreen/welcome.html

Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
width: 100vw;
3535
background: #FBFBFB;
3636
grid-template-columns: auto 250px 250px auto;
37-
grid-template-rows: auto 80px 250px 150px auto;
37+
grid-template-rows: auto 80px 250px 150px 45px auto;
3838
}
3939
.update{
4040
grid-column-start: 2;
@@ -65,11 +65,19 @@
6565
}
6666

6767
.linkitem{
68-
background: black;
69-
color: white;
68+
background: #0070c033;
69+
color: black;
70+
font-weight: bold;
7071
font-size: smaller;
7172
padding: 5px 10px 5px 10px;
7273
text-decoration: none;
74+
border-bottom: 2px solid black;
75+
}
76+
77+
.linkitem:hover{
78+
background: #0070C0;
79+
color: white;
80+
cursor: pointer;
7381
}
7482

7583
.projects{
@@ -89,6 +97,24 @@
8997
color: #007acc;
9098
width: fit-content;
9199
}
100+
101+
.subscribe {
102+
grid-column-start: 2;
103+
grid-column-end: 4;
104+
grid-row-start: 5;
105+
grid-row-end: 6;
106+
background: #0070c033;
107+
padding: 8px;
108+
margin-top: 10px;
109+
font-weight: bold;
110+
font-size: smaller;
111+
border-bottom: 2px solid black;
112+
}
113+
.subscribe:hover {
114+
background: #0070C0;
115+
color: white;
116+
cursor: pointer;
117+
}
92118
</style>
93119
</head>
94120
<body>
@@ -107,6 +133,9 @@ <h1>The Activity Browser</h1>
107133
<div class="projects">
108134
<h2>Recent projects:</h2>
109135
</div>
136+
<div class="subscribe" onclick="window.open('https://brightway.groups.io/g/AB-updates', '_self')">
137+
Subscribe to our mailing list to stay up to date!
138+
</div>
110139
<script src="qrc:///qtwebchannel/qwebchannel.js"></script>
111140
<script>
112141

0 commit comments

Comments
 (0)